Merge pull request #429 from eb1/master

Fix #428
adapt-it · Nov 5, 2020 · 99e9d32 · 99e9d32
2 parents fa5344f + 8cefd7e
commit 99e9d32
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="33" defaultlocale="en" id="org.adaptit.adaptitmobile" ios-CFBundleVersion="1.4.1" version="1.4.0" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:gap="http://phonegap.com/ns/1.0">
+<widget android-versionCode="34" defaultlocale="en" id="org.adaptit.adaptitmobile" ios-CFBundleVersion="1.4.2" version="1.4.2" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:gap="http://phonegap.com/ns/1.0">
     <name short="Adapt It Mobile" xml:lang="en">Adapt It Mobile</name>
     <description xml:lang="en">
         An open source application for translating between related languages.
@@ -18,7 +18,6 @@
     <preference name="SplashMaintainAspectRatio" value="false" />
     <preference name="SplashShowOnlyFirstTime" value="false" />
     <preference name="AutoHideSplashScreen" value="true" />
-    <hook src="hooks/after_prepare/uglify.js" type="after_prepare" />
     <platform name="android">
         <plugin name="cordova-sqlite-evcore-extbuild-free" spec="^0.9.8" />
         <plugin name="cordova-plugin-statusbar" spec="^2.4.3" />

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "adapt-it-mobile",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Adapt It Mobile",
   "repository": {
     "type": "git",
@@ -86,4 +86,4 @@
       "android"
     ]
   }
-}
+}
diff --git a/www/js/Application.js b/www/js/Application.js
@@ -77,9 +77,9 @@ define(function (require) {
             currentProject: null,
             localURLs: [],
             usingImportedKB: false,
-            version: "1.4.0", // appended with milestone / iOS build info
-            AndroidBuild: "33", // (was milestone release #)
-            iOSBuild: "1.4.1",
+            version: "1.4.2", // appended with milestone / iOS build info
+            AndroidBuild: "34", // (was milestone release #)
+            iOSBuild: "1.4.2",
 
             // Mimics Element.scrollIntoView({"block": "center", "behavior": "smooth"}) for
             // browsers that do not support this scrollIntoViewOptions yet.

diff --git a/www/locales/tpi/translation.json b/www/locales/tpi/translation.json
@@ -316,11 +316,11 @@
         "lblTextBidi": "Tupela i makim rot",
         "lblDetails": "Detail",
         "ttlEditorUI": "Editor and User Interface",
-        "ttlManageProjects": "Projeks",
+        "ttlManageProjects": "Managim Projeks",
         "ttlCurrentProjectSettings": "Seting bilong Projek",
-        "dscEditProjectSourceLanguage": "Correct any errors to the <em>source language</em> and dialect fields. To create a new project, use the Projeks page (Settings > Projeks).",
-        "dscEditProjectTargetLanguage": "Correct any errors to the <em>target language</em> and dialect fields. To create a new project, use the Projeks page (Settings > Projeks).",
-        "dscWarnChangeProject": "Do not modify the project's source and target language to create a new project. New projects can be created in the Projeks page (Settings > Projeks).",
+        "dscEditProjectSourceLanguage": "Correct any errors to the <em>source language</em> and dialect fields. To create a new project, use the Managim Projeks page (Settings > Managim Projeks).",
+        "dscEditProjectTargetLanguage": "Correct any errors to the <em>target language</em> and dialect fields. To create a new project, use the Managim Projeks page (Settings > Managim Projeks).",
+        "dscWarnChangeProject": "Do not modify the project's source and target language to create a new project. New projects can be created in the Managim Projeks page (Settings > Managim Projeks).",
         "_comment" : "****Add new strings BEFORE this line!****"
     },
     "help": {

diff --git a/www/res/css/styles.css b/www/res/css/styles.css
@@ -1376,6 +1376,18 @@ ul.btns {
     vertical-align: sub;
     width: 25px;
 }
+.btn-connectproject {
+	background-image: url("../svg/project-connect.svg");
+    background-position: center;
+	background-repeat: no-repeat;
+    background-size: contain;
+    display: inline-block;
+    height: 28px;
+    margin-left: 6px;
+    margin-right: 6px;
+    vertical-align: sub;
+    width: 28px;
+}
 .btn-copyproject{
 	background-image: url("../svg/project-copy.svg");
     background-position: center;