Merge branch 'release-9.2'

unfoldingWord-dev · Jul 26, 2016 · d09c9a8 · d09c9a8
2 parents 9e7d7f2 + a6a7801
commit d09c9a8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "translationstudio",
   "productName": "translationStudio",
   "version": "9.2.0",
-  "build": "30",
+  "build": "31",
   "description": "A utility for translating the Bible and biblical content into any language.",
   "keywords": [],
   "homepage": "https://github.com/unfoldingWord-dev/ts-desktop",

diff --git a/scripts/win32_installer.iss b/scripts/win32_installer.iss
@@ -3,7 +3,7 @@
 
 #define MyAppName "translationStudio"
 #define Version "9.2"
-#define Build "30"
+#define Build "31"
 #define MyAppPublisher "Unfolding Word"
 #define MyAppURL "https://unfoldingword.org"
 #define MyAppExeName "translationStudio.exe"

diff --git a/scripts/win64_installer.iss b/scripts/win64_installer.iss
@@ -3,7 +3,7 @@
 
 #define MyAppName "translationStudio"
 #define Version "9.2"
-#define Build "30"
+#define Build "31"
 #define MyAppPublisher "Unfolding Word"
 #define MyAppURL "https://unfoldingword.org"
 #define MyAppExeName "translationStudio.exe"

diff --git a/src/js/database.js b/src/js/database.js
@@ -17,7 +17,7 @@ function DataManager(db) {
         updateLanguageList: function () {
             var req = utils.promisify(request);
 
-            return req('http://td.unfoldingword.org/exports/langnames.json')
+            return req({url: 'http://td.unfoldingword.org/exports/langnames.json', timeout: 60000})
                 .then(function (response) {
                     return JSON.parse(response.body);
                 })