Merge pull request #8501 from keymanapp/chore/web/update-feature-esmo…

…dule-for-configure-fix

HISTORY.md

@@ -1,5 +1,53 @@
 # Keyman Version History
 
+## 17.0.74 alpha 2023-03-22
+
+* chore(windows): update sentry-native to 0.6.0 (#8464)
+* chore(linux): Prevent building on s390x (#8477)
+* fix(linux): Display error message for corrupt .kmp file (#8479)
+
+## 17.0.73 alpha 2023-03-21
+
+* refactor(android/engine): Consolidate insertText (#8438)
+* chore(common): prevent multiple npm ci runs in child scripts (#8484)
+
+## 17.0.72 alpha 2023-03-20
+
+* chore(common): die early when --ci and --debug passed to test.sh (#8465)
+* chore(common): Update crowdin strings for Kibaku (#8447)
+
+## 17.0.71 alpha 2023-03-18
+
+* fix(core): ldml update fr-azerty for VKEY mapping (#8434)
+
+## 17.0.70 alpha 2023-03-17
+
+* chore(android): Document builder script steps (#8449)
+
+## 17.0.69 alpha 2023-03-16
+
+* chore(web): Cleanup build echo (#8446)
+* fix(developer): lm compiler handle missing line no in errors (#8444)
+* fix(android/app): Temporarily disable Keyman browser (#8430)
+* fix(android/engine): Add builder output for configure (#8442)
+* chore(linux): Update debian changelog (#8452)
+
+## 17.0.68 alpha 2023-03-15
+
+* chore(common): add common test build configurations (#8431)
+* fix(common): fix broken common/web/types cases (#8426)
+* fix(developer/compilers): locks esbuild target detection for kmc building (#8437)
+*  (#8412)
+*  (#8436)
+* chore(linux): Use dependency on core in ibus-keyman/build.sh (#8423)
+
+## 17.0.67 alpha 2023-03-14
+
+* (developer):Update copyright period in License.rtf (#8425)
+* chore(common): support shorthand for build.sh (#8415)
+* chore(common): build script performance improvements (#8416)
+* chore(common): TS updates to non-sync'd packages, feature-esmodule merge conflict prevention (#8429)
+
 ## 17.0.66 alpha 2023-03-13
 
 * refactor(android): Use builder scripts (#7407)

VERSION.md

@@ -1 +1 @@
-17.0.67
+17.0.75

android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java

@@ -435,9 +435,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
       case R.id.action_share:
         showShareDialog();
         return true;
+      /* Disable Web Browser to investigate Google sign-in
       case R.id.action_web:
         showWebBrowser();
-        return true;
+        return true;*/
       case R.id.action_text_size:
         showTextSizeDialog();
         return true;

android/KMAPro/kMAPro/src/main/res/menu-land/main.xml

@@ -8,12 +8,13 @@
         app:showAsAction="always"
         android:title="@string/action_share"
         android:icon="@drawable/ic_light_action_share" />
-
-    <item
+
+  <!-- Disable Web Browser to investigate Google sign-in -->
+  <!--item
         android:id="@+id/action_web"
         app:showAsAction="always"
         android:title="@string/action_web"
-        android:icon="@drawable/ic_light_action_web" />
+        android:icon="@drawable/ic_light_action_web" /> -->
 
     <item
         android:id="@+id/action_text_size"

android/KMAPro/kMAPro/src/main/res/menu-sw600dp/main.xml

@@ -8,12 +8,13 @@
         app:showAsAction="always"
         android:title="@string/action_share"
         android:icon="@drawable/ic_light_action_share" />
-
-    <item
+
+    <!-- Disable Web Browser to investigate Google sign-in -->
+    <!--item
         android:id="@+id/action_web"
         app:showAsAction="always"
         android:title="@string/action_web"
-        android:icon="@drawable/ic_light_action_web" />
+        android:icon="@drawable/ic_light_action_web" /-->
 
     <item
         android:id="@+id/action_text_size"

android/KMAPro/kMAPro/src/main/res/menu/main.xml

@@ -8,12 +8,13 @@
         app:showAsAction="always"
         android:title="@string/action_share"
         android:icon="@drawable/ic_light_action_share" />
-
-    <item
+
+    <!-- Disable Web Browser to investigate Google sign-in -->
+    <!--item
         android:id="@+id/action_web"
         app:showAsAction="always"
         android:title="@string/action_web"
-        android:icon="@drawable/ic_light_action_web" />
+        android:icon="@drawable/ic_light_action_web" /> -->
 
     <!-- Set showAsAction="never" for overflow -->
     <item

android/KMAPro/kMAPro/src/main/res/values-ckl-rNG/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <!-- app_name removed in 16.0 beta. Set in build.gradle -->
   <!-- Context: Menu Action -->
   <string name="action_share" comment="Menu action to send text content to another app">Ndǝɦǝnta</string>
   <!-- Context: Menu Action -->
@@ -25,6 +26,7 @@
   <!-- Context: Textfield prompt (&#8230; is the ellipsis character "...") -->
   <string name="textview_hint" comment="Prompt to start typing">Badicini taiping akwani&#8230;</string>
   <!-- Context: Splash screen (version/copyright info currently disabled -->
+  <string name="splash_blank" translatable="false" comment="Blank text while version info on splash page is disabled"></string>
   <!-- Context: Splash screen (version/copyright info currently disabled -->
   <!-- Context: Text Size dialog -->
   <string name="text_size" comment="Current text size (number)">Ngakurǝr Text: %1$d</string>
@@ -82,7 +84,7 @@
   <!-- Context: Keyman Settings menu / Spacebar caption hint -->
   <string name="spacebar_caption_hint_blank" comment="Spacebar caption hint - blank">Ta gǝta tsanti kapshion ata spesba</string>
   <!-- Context: Keyman Settings menu / Haptic feedback -->
-  <string name="haptic_feedback" comment="haptic feedback on key press">Vibrate when typing</string>
+  <string name="haptic_feedback" comment="haptic feedback on key press">Ata kǝngǝri ko tuwa ma gata kǝra ʻya taiping</string>
   <!-- Context: Keyman Settings menu -->
   <string name="show_banner" comment="text suggestions banner">Tsanti banner kǝlara saka</string>
   <!-- Context: Keyman Settings menu -->
@@ -154,7 +156,7 @@
   <!-- Context: KMP Package strings -->
   <string name="invalid_metadata" comment="kmp.json metadata file is invalid or missing in package">Invalid/Missing metadata in package</string>
   <!-- Context: KMP Package strings -->
-  <string name="minimum_keyboard_version_not_supported" comment="Notification when keyboard has functionality not supported by current Keyman">    Keyboard requires a newer version of Keyman</string>
+  <string name="minimum_keyboard_version_not_supported" comment="Notification when keyboard has functionality not supported by current Keyman">  Kibod ǝni ada kǝthlǝr aka jiliyir Keyman nam bǝlin.  </string>
   <!-- Context: anywhere -->
-  <string name="unable_to_open_browser" comment="Notification when a browser activity cannot be launched">Unable to launch web browser</string>
+  <string name="unable_to_open_browser" comment="Notification when a browser activity cannot be launched">Yar ta mǝzi ka mburnta brauza wɛ</string>
 </resources>

android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboard.java

@@ -67,12 +67,12 @@
 final class KMKeyboard extends WebView {
   private static final String TAG = "KMKeyboard";
   private final Context context;
-  private KeyboardType keyboardType = KeyboardType.KEYBOARD_TYPE_UNDEFINED;
   private String packageID;
   private String keyboardID;
   private String keyboardName;
   private String keyboardVersion;
 
+  protected KeyboardType keyboardType = KeyboardType.KEYBOARD_TYPE_UNDEFINED;
   protected ArrayList<String> javascriptAfterLoad = new ArrayList<String>();
 
   private static String currentKeyboard = null;