From d17da64a31ee08caf20edec7f66906144efe1ae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 13 May 2021 17:03:57 +0200
Subject: [PATCH 1/2] MOBILE-3615 menu: Use parent language if any on docs url

---
 .../myoverview/addon-block-myoverview.html      |  3 ++-
 src/core/services/lang.ts                       | 17 +++++++++++++++--
 src/core/services/utils/url.ts                  |  3 ++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index 56e361736..dd8b91778 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -51,7 +51,8 @@
                 [disabled]="showFilters.future == 'disabled'">
                 {{ 'addon.block_myoverview.future' | translate }}
             </ion-select-option>
-            <ion-select-option class="ion-text-wrap" value="past" *ngIf="showFilters.past != 'hidden'" [disabled]="showFilters.past == 'disabled'">
+            <ion-select-option class="ion-text-wrap" value="past" *ngIf="showFilters.past != 'hidden'"
+                [disabled]="showFilters.past == 'disabled'">
                 {{ 'addon.block_myoverview.past' | translate }}
             </ion-select-option>
             <ng-container *ngIf="showFilters.custom != 'hidden'">
diff --git a/src/core/services/lang.ts b/src/core/services/lang.ts
index 89b987416..9f1de3abe 100644
--- a/src/core/services/lang.ts
+++ b/src/core/services/lang.ts
@@ -118,6 +118,19 @@ export class CoreLangProvider {
         return value.charAt(0).toUpperCase() + value.slice(1);
     }
 
+    /**
+     * Get the parent language defined on the language strings.
+     *
+     * @param currentLanguage Current language.
+     * @returns If a parent language is set, return the index name.
+     */
+    getParentLanguage(currentLanguage: string): string | undefined {
+        const parentLang = Translate.instant('core.parentlanguage');
+        if (parentLang != '' && parentLang != 'core.parentlanguage' && parentLang != currentLanguage) {
+            return parentLang;
+        }
+    }
+
     /**
      * Change current language.
      *
@@ -131,9 +144,9 @@ export class CoreLangProvider {
         promises.push(new Promise((resolve, reject) => {
             CoreSubscriptions.once(Translate.use(language), data => {
                 // It's a language override, load the original one first.
-                const fallbackLang = Translate.instant('core.parentlanguage');
+                const fallbackLang = this.getParentLanguage(language);
 
-                if (fallbackLang != '' && fallbackLang != 'core.parentlanguage' && fallbackLang != language) {
+                if (fallbackLang) {
                     CoreSubscriptions.once(
                         Translate.use(fallbackLang),
                         fallbackData => {
diff --git a/src/core/services/utils/url.ts b/src/core/services/utils/url.ts
index e9920d1fd..258070011 100644
--- a/src/core/services/utils/url.ts
+++ b/src/core/services/utils/url.ts
@@ -242,7 +242,8 @@ export class CoreUrlUtilsProvider {
         }
 
         try {
-            const lang = await CoreLang.getCurrentLanguage();
+            let lang = await CoreLang.getCurrentLanguage();
+            lang = CoreLang.getParentLanguage(lang) || lang;
 
             return docsUrl.replace('/en/', '/' + lang + '/');
         } catch (error) {

From f4ad5c7eea65ccc89696586df61ffe5085cd215e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 14 May 2021 10:26:52 +0200
Subject: [PATCH 2/2] MOBILE-3615 dark: Fix darkmode flip colors

---
 src/theme/globals.mixins.ionic.scss | 2 +-
 src/theme/globals.variables.scss    | 8 --------
 src/theme/theme.dark.scss           | 2 +-
 src/theme/theme.light.scss          | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/theme/globals.mixins.ionic.scss b/src/theme/globals.mixins.ionic.scss
index e609daf1f..cd4a762ca 100644
--- a/src/theme/globals.mixins.ionic.scss
+++ b/src/theme/globals.mixins.ionic.scss
@@ -98,7 +98,7 @@
 // Generates the color classes and variables based on the
 // colors map
 
-@mixin generate-color($color-name) {
+@mixin generate-color($color-name, $colors) {
     $value: map-get($colors, $color-name);
 
     $base: map-get($value, base);
diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss
index 23e5aa06d..f30a600d0 100644
--- a/src/theme/globals.variables.scss
+++ b/src/theme/globals.variables.scss
@@ -132,15 +132,7 @@ $colors:  (
 
 // Just swipe light and dark.
 $colors-dark:  (
-    primary: map-get($colors, primary),
-    secondary: map-get($colors, secondary),
-    tertiary: map-get($colors, tertiary),
-    success: map-get($colors, success),
-    warning: map-get($colors, warning),
-    danger: map-get($colors, danger),
-    info: map-get($colors, info),
     light: map-get($colors, dark),
-    medium: map-get($colors, medium),
     dark: map-get($colors, light),
 ) !default;
 
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss
index ef871c0e6..69be801f8 100644
--- a/src/theme/theme.dark.scss
+++ b/src/theme/theme.dark.scss
@@ -38,7 +38,7 @@
     --dark: #{$light};
 
     @each $color-name, $value in $colors-dark {
-        @include generate-color($color-name);
+        @include generate-color($color-name, $colors-dark);
     }
 
     --ion-tab-bar-background: #1f1f1f;
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 62527d5e9..4431c5075 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -59,7 +59,7 @@
     --medium: #{$medium};
 
     @each $color-name, $value in $colors {
-        @include generate-color($color-name);
+        @include generate-color($color-name, $colors);
     }
 
     // Accessibility vars.