Merge pull request #2439 from moodlehq/integration

Integration

Author: jleyva

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="39000" id="com.moodle.moodlemobile" ios-CFBundleVersion="3.9.0.0" version="3.9.0" versionCode="39000" 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">
+<widget android-versionCode="39000" id="com.moodle.moodlemobile" ios-CFBundleVersion="3.9.1.0" version="3.9.1" versionCode="39100" 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">
     <name>Moodle</name>
     <description>Moodle official app</description>
     <author email="[email protected]" href="http://moodle.com">Moodle Mobile team</author>
@@ -241,7 +241,7 @@
             <true />
         </edit-config>
         <edit-config file="*-Info.plist" mode="merge" target="CFBundleShortVersionString">
-            <string>3.9.0</string>
+            <string>3.9.1</string>
         </edit-config>
         <config-file parent="FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED" target="*-Info.plist">
             <string>YES</string>

desktop/assets/windows/AppXManifest.xml

@@ -6,7 +6,7 @@
   <Identity Name="3312ADB7.MoodleDesktop"
     ProcessorArchitecture="x64"
     Publisher="CN=33CDCDF6-1EB5-4827-9897-ED25C91A32F6"
-    Version="3.9.0.0" />
+    Version="3.9.1.0" />
   <Properties>
     <DisplayName>Moodle Desktop</DisplayName>
     <PublisherDisplayName>Moodle Pty Ltd.</PublisherDisplayName>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "moodlemobile",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "description": "The official app for Moodle.",
   "author": {
     "name": "Moodle Pty Ltd.",
@@ -253,7 +253,7 @@
       "category": "public.app-category.education",
       "icon": "resources/desktop/icon.icns",
       "target": "mas",
-      "bundleVersion": "3.9.0",
+      "bundleVersion": "3.9.1",
       "extendInfo": {
         "ElectronTeamID": "2NU57U5PAW"
       }

scripts/lang_functions.php

@@ -120,8 +120,6 @@ function add_langs_to_config($langs, $config) {
 function get_langfolder($lang) {
     $folder = LANGPACKSFOLDER.'/'.str_replace('-', '_', $lang);
     if (!is_dir($folder) || !is_file($folder.'/langconfig.php')) {
-        echo "Cannot translate $folder, folder not found";
-
         return false;
     }
 
@@ -173,6 +171,8 @@ function reset_translations_strings() {
 function build_lang($lang, $keys) {
     $langfoldername = get_langfolder($lang);
     if (!$langfoldername) {
+        echo "Cannot translate $lang, folder not found";
+
         return false;
     }
 
@@ -182,15 +182,18 @@ function build_lang($lang, $keys) {
         $override_langfolder = false;
     }
 
-    $total = count ($keys);
+    $total = count($keys);
     $local = 0;
 
-    $string = get_translation_strings($langfoldername, 'langconfig');
-    $parent = isset($string['parentlanguage']) ? $string['parentlanguage'] : "";
+    $langparts = explode('-', $lang, 2);
+    $parentname = $langparts[0] ?? "";
+    $parent = "";
 
     echo "Processing $lang";
-    if ($parent != "" && $parent != $lang) {
-        echo " ($parent)";
+    // Check parent language exists.
+    if ($parentname != $lang && get_langfolder($parentname)) {
+        echo " ($parentname)";
+        $parent = $parentname;
     }
 
     $langFile = false;
@@ -247,6 +250,12 @@ function build_lang($lang, $keys) {
         $translations[$key] = html_entity_decode($text);
     }
 
+    if (!empty($parent)) {
+        $translations['core.parentlanguage'] = $parent;
+    } else if (isset($translations['core.parentlanguage'])) {
+        unset($translations['core.parentlanguage']);
+    }
+
     // Sort and save.
     ksort($translations);
     file_put_contents(ASSETSPATH.$lang.'.json', str_replace('\/', '/', json_encode($translations, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)));
@@ -275,6 +284,8 @@ function progressbar($percentage) {
 function detect_lang($lang, $keys) {
     $langfoldername = get_langfolder($lang);
     if (!$langfoldername) {
+        echo "Cannot translate $lang, folder not found";
+
         return false;
     }
 

src/assets/lang/ca.json

@@ -1913,7 +1913,6 @@
     "core.openmodinbrowser": "Obre {{$a}} al navegador",
     "core.othergroups": "Altres grups",
     "core.pagea": "Pàgina {{$a}}",
-    "core.parentlanguage": "",
     "core.paymentinstant": "Utilitzeu el botó de baix per pagar i inscriure-us.",
     "core.percentagenumber": "{{$a}}%",
     "core.phone": "Telèfon",

src/assets/lang/cs.json

@@ -1909,7 +1909,6 @@
     "core.openmodinbrowser": "Otevřít {{$a}} v prohlížeči",
     "core.othergroups": "Další skupiny",
     "core.pagea": "Stránka {{$a}}",
-    "core.parentlanguage": "",
     "core.paymentinstant": "Pomocí tlačítka níže můžete provést platbu a během několika minut se zapsat do kurzu!",
     "core.percentagenumber": "{{$a}}%",
     "core.phone": "Telefon",

src/assets/lang/da.json

@@ -1752,7 +1752,6 @@
     "core.openinbrowser": "Åben i browser",
     "core.othergroups": "Andre grupper",
     "core.pagea": "Side {{$a}}",
-    "core.parentlanguage": "",
     "core.paymentinstant": "Brug knappen forneden til at betale og blive tilmeldt umiddelbart derefter.",
     "core.percentagenumber": "{{$a}}%",
     "core.phone": "Telefon",

src/assets/lang/el.json

@@ -1841,7 +1841,6 @@
     "core.openinbrowser": "Ανοίξτε στον περιηγητή.",
     "core.othergroups": "Άλλες ομάδες",
     "core.pagea": "Σελίδα {{$a}}",
-    "core.parentlanguage": "",
     "core.paymentinstant": "Χρησιμοποιήστε το παρακάτω πλήκτρο για να πληρώσετε και να εγγραφείτε μέσα σε λίγα λεπτά!",
     "core.percentagenumber": "{{$a}}%",
     "core.phone": "Τηλέφωνο",

src/assets/lang/en-us.json

@@ -14,6 +14,7 @@
     "core.listsep": ",",
     "core.login.loginsteps": "For full access to this site, you first need to create an account.",
     "core.notenrolledprofile": "This profile is not available because this user is not enrolled in this course.",
+    "core.parentlanguage": "en",
     "core.paymentinstant": "Use the button below to pay and be enrolled within minutes!",
     "core.settings.license": "License",
     "core.strftimedate": "%B %d, %Y",

src/assets/lang/en.json

@@ -1557,6 +1557,7 @@
     "core.errorsomedatanotdownloaded": "If you downloaded this activity, please notice that some data isn't downloaded during the download process for performance and data usage reasons.",
     "core.errorsync": "An error occurred while synchronising. Please try again.",
     "core.errorsyncblocked": "This {{$a}} cannot be synchronised right now because of an ongoing process. Please try again later. If the problem persists, try restarting the app.",
+    "core.errorurlschemeinvalidsite": "This site URL cannot be opened in this app.",
     "core.explanationdigitalminor": "This information is required to determine if your age is over the digital age of consent. This is the age when an individual can consent to terms and conditions and their data being legally stored and processed.",
     "core.favourites": "Starred",
     "core.filename": "Filename",