Merge pull request #4663 from crazyserver/MOBILE-4967

MOBILE-4967: Add some functions to override features for Workplace app 5.1

Author: dpalou

.github/workflows/docker.yml

@@ -1,6 +1,10 @@
 name: Docker Build and Test
 
-on: [push, workflow_dispatch]
+on:
+  push:
+    branches: [main, freemium-*, workplace-main]
+    tags: ["v*.x", "freemium-*", "workplace-*"]
+  workflow_dispatch:
 
 concurrency:
   group: docker-${{ github.ref }}

.github/workflows/testing.yml

@@ -68,7 +68,7 @@ jobs:
           cat circular-dependencies
           lines=$(cat circular-dependencies | wc -l)
           echo "Total circular dependencies: $lines"
-          test $lines -eq 80
+          test $lines -eq 81
       - name: JavaScript code compatibility
         run: |
           # Check for ES2021 features, allowing ErrorCause feature.

gulp/task-build-lang.js

@@ -64,13 +64,13 @@ class BuildLangTask {
         gulp.src(paths, { allowEmpty: true })
             .pipe(slash())
             .pipe(clipEmptyFiles())
-            .pipe(through(function(file) {
+            .pipe(through(function (file) {
                 if (!firstFile) {
                     firstFile = file;
                 }
 
                 return self.treatFile(file, data);
-            }, function() {
+            }, function () {
                 /* This implementation is based on gulp-jsoncombine module.
                  * https://github.com/reflog/gulp-jsoncombine */
                 if (firstFile) {
@@ -155,7 +155,7 @@ class BuildLangTask {
                     filename = filename.split('.').slice(0, -1).join('.');
                     return `assets.${filename}.`;
                 default:
-                    return `${folders[0]}.${folders[1]}.`;
+                    return `${folders.join('.')}.`;
             }
         }
 

src/addons/filter/multilang/services/handlers/multilang.ts

@@ -58,18 +58,19 @@ export class AddonFilterMultilangHandlerService extends CoreFilterDefaultHandler
         }
 
         // Find language to use.
-        const language = [
+        let language = [
             await CoreLang.getCurrentLanguage(),
             CoreLang.getParentLanguage(),
             CoreLang.getFallbackLanguage(),
             firstLanguage,
-        ]
-            .find(candidate => candidate && languages.has(candidate));
+        ].find(candidate => candidate && languages.has(candidate));
 
         if (!language) {
             return text;
         }
 
+        language = CoreLang.getLanguageAppVariant(language);
+
         // Apply filter.
         const anyLangRegEx = /<(lang|span)[^>]+lang="[a-zA-Z0-9_-]+"[^>]*>.*?<\/(lang|span)>/img;
         const languageRegEx = language.replace(/-/g, '(?:-|_)');

src/addons/filter/multilang2/services/handlers/multilang2.ts

@@ -43,7 +43,7 @@ export class AddonFilterMultilang2HandlerService extends CoreFilterDefaultHandle
             return text;
         }
 
-        const currentLang = await CoreLang.getCurrentLanguage();
+        const currentLang = CoreLang.getLanguageAppVariant(await CoreLang.getCurrentLanguage());
         this.replacementDone = false;
         const parentLanguage = CoreLang.getParentLanguage();
 
@@ -85,9 +85,17 @@ export class AddonFilterMultilang2HandlerService extends CoreFilterDefaultHandle
     protected replaceLangs(replaceLang: string, langBlock: string[], parentLanguage: string | undefined): string {
         // Normalize languages.
         const blockLangs = (langBlock[1] ?? '').replace(/ /g, '').replace(/_/g, '-').toLowerCase().split(',');
+        const langSuffix = CoreLang.getLanguageSuffix();
+
         const blockText = langBlock[2] ?? '';
 
-        for (const blockLang of blockLangs) {
+        for (let blockLang of blockLangs) {
+            if (langSuffix) {
+                blockLang = blockLang.endsWith(`-${langSuffix}`)
+                    ? blockLang.replace(`-${langSuffix}`, `_${langSuffix}`)
+                    : blockLang;
+            }
+
             /* We don't check for empty values of blockLang as they simply don't
              * match any language and they don't produce any errors or warnings.
              */

src/addons/mod/data/services/data-fields-delegate.ts

@@ -111,10 +111,10 @@ export interface AddonModDataFieldHandler extends CoreDelegateHandler {
     /**
      * Override field content data with offline submission.
      *
-     * @param originalContent Original data to be overriden.
+     * @param originalContent Original data to be overridden.
      * @param offlineContent Array with all the offline data to override.
      * @param offlineFiles Array with all the offline files in the field.
-     * @returns Data overriden
+     * @returns Data overridden
      */
     overrideData?(
         originalContent: AddonModDataEntryField,
@@ -247,10 +247,10 @@ export class AddonModDataFieldsDelegateService extends CoreDelegate<AddonModData
      * Override field content data with offline submission.
      *
      * @param field Defines the field to be rendered.
-     * @param originalContent Original data to be overriden.
+     * @param originalContent Original data to be overridden.
      * @param offlineContent Array with all the offline data to override.
      * @param offlineFiles Array with all the offline files in the field.
-     * @returns Data overriden
+     * @returns Data overridden
      */
     overrideData(
         field: AddonModDataField,

src/addons/mod/workshop/components/assessment/addon-mod-workshop-assessment.html

@@ -17,7 +17,7 @@ <h2>{{profile.fullname}}</h2>
                 </p>
             }
             @if (access.canviewallsubmissions && showGrade(assessment.gradinggradeover)) {
-                <p class="core-overriden-grade">
+                <p class="core-overridden-grade">
                     {{ 'addon.mod_workshop.gradinggradeof' | translate:{$a: workshop.gradinggrade } }}: {{assessment.gradinggradeover}}
                 </p>
             }

src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html

@@ -14,12 +14,12 @@ <h2>
                         <p>{{profile.fullname}}</p>
                     }
                     @if (showGrade(submission.grade)) {
-                        <p [class.addon-has-overriden-grade]="showGrade(submission.gradeover)">
+                        <p [class.addon-has-overridden-grade]="showGrade(submission.gradeover)">
                             {{ 'addon.mod_workshop.submissiongradeof' | translate:{$a: workshop.grade } }}: {{submission.grade}}
                         </p>
                     }
                     @if (showGrade(submission.gradeover)) {
-                        <p class="addon-overriden-grade">
+                        <p class="addon-overridden-grade">
                             {{ 'addon.mod_workshop.gradeover' | translate }}: {{submission.gradeover}}
                         </p>
                     }
@@ -118,7 +118,7 @@ <h2>
                     </p>
                 }
                 @if (showGrade(submission.gradeover)) {
-                    <p class="addon-overriden-grade">
+                    <p class="addon-overridden-grade">
                         {{ 'addon.mod_workshop.submissiongradeof' | translate:{$a: workshop.grade } }}: {{submission.gradeover}}
                     </p>
                 }

src/addons/mod/workshop/components/submission/submission.scss

@@ -1,9 +1,9 @@
 :host {
-  p.addon-overriden-grade {
+  p.addon-overridden-grade {
     color: var(--success);
   }
 
-  p.addon-has-overriden-grade {
+  p.addon-has-overridden-grade {
     color: var(--danger);
     text-decoration: line-through;
   }

src/addons/mod/workshop/pages/assessment/assessment.html

@@ -42,12 +42,12 @@ <h2>{{profile.fullname}}</h2>
                     </p>
                 }
                 @if (workshop && access && access.canviewallsubmissions && assessment && showGrade(assessment.gradinggrade)) {
-                    <p [class.core-has-overriden-grade]=" showGrade(assessment.gradinggrade)">
+                    <p [class.core-has-overridden-grade]=" showGrade(assessment.gradinggrade)">
                         {{ 'addon.mod_workshop.gradinggradeof' | translate:{$a: workshop.gradinggrade } }}: {{assessment.gradinggrade}}
                     </p>
                 }
                 @if (access && access.canviewallsubmissions && assessment && showGrade(assessment.gradinggradeover)) {
-                    <p class="core-overriden-grade">
+                    <p class="core-overridden-grade">
                         {{ 'addon.mod_workshop.gradinggradeover' | translate }}: {{assessment.gradinggradeover}}
                     </p>
                 }