MOBILE-4362 user: Fix timezone names

moodlehq · Oct 6, 2023 · 4cee48f · 4cee48f
1 parent b39bd13
commit 4cee48f
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 5 deletions.
diff --git a/src/core/features/user/pages/about/about.ts b/src/core/features/user/pages/about/about.ts
@@ -120,11 +120,7 @@ export class CoreUserAboutPage implements OnInit, OnDestroy {
 
             this.user.address = CoreUserHelper.formatAddress('', user.city, user.country);
 
-            const serverTimezone = CoreSites.getCurrentSite()?.getStoredConfig('timezone');
-            this.displayTimezone = !!serverTimezone;
-            if (this.displayTimezone && this.user.timezone === USER_PROFILE_SERVER_TIMEZONE) {
-                this.user.timezone = serverTimezone;
-            }
+            this.fillTimezone();
 
             await this.checkUserImageUpdated();
         } catch (error) {
@@ -261,6 +257,30 @@ export class CoreUserAboutPage implements OnInit, OnDestroy {
         return avatarUrl;
     }
 
+    /**
+     * Fill user timezone depending on the server and fix the legacy timezones.
+     */
+    protected fillTimezone(): void {
+        if (!this.user) {
+            return;
+        }
+
+        const serverTimezone = CoreSites.getRequiredCurrentSite().getStoredConfig('timezone');
+        this.displayTimezone = !!serverTimezone;
+
+        if (!this.displayTimezone) {
+            return;
+        }
+
+        if (this.user.timezone === USER_PROFILE_SERVER_TIMEZONE) {
+            this.user.timezone = serverTimezone;
+        }
+
+        if (this.user.timezone) {
+            this.user.timezone = CoreUserHelper.translateLegacyTimezone(this.user.timezone);
+        }
+    }
+
     /**
      * Open a user interest.
      *

diff --git a/src/core/features/user/services/user-helper.ts b/src/core/features/user/services/user-helper.ts
@@ -25,6 +25,63 @@ import { CoreUserProfile, CoreUserRole } from './user';
 @Injectable({ providedIn: 'root' })
 export class CoreUserHelperProvider {
 
+    protected static readonly LEGACY_TIMEZONES = {
+        '-13.0': 'Australia/Perth',
+        '-12.5': 'Etc/GMT+12',
+        '-12.0': 'Etc/GMT+12',
+        '-11.5': 'Etc/GMT+11',
+        '-11.0': 'Etc/GMT+11',
+        '-10.5': 'Etc/GMT+10',
+        '-10.0': 'Etc/GMT+10',
+        '-9.5': 'Etc/GMT+9',
+        '-9.0': 'Etc/GMT+9',
+        '-8.5': 'Etc/GMT+8',
+        '-8.0': 'Etc/GMT+8',
+        '-7.5': 'Etc/GMT+7',
+        '-7.0': 'Etc/GMT+7',
+        '-6.5': 'Etc/GMT+6',
+        '-6.0': 'Etc/GMT+6',
+        '-5.5': 'Etc/GMT+5',
+        '-5.0': 'Etc/GMT+5',
+        '-4.5': 'Etc/GMT+4',
+        '-4.0': 'Etc/GMT+4',
+        '-3.5': 'Etc/GMT+3',
+        '-3.0': 'Etc/GMT+3',
+        '-2.5': 'Etc/GMT+2',
+        '-2.0': 'Etc/GMT+2',
+        '-1.5': 'Etc/GMT+1',
+        '-1.0': 'Etc/GMT+1',
+        '-0.5': 'Etc/GMT',
+        '0': 'Etc/GMT',
+        '0.0': 'Etc/GMT',
+        '0.5': 'Etc/GMT',
+        '1.0': 'Etc/GMT-1',
+        '1.5': 'Etc/GMT-1',
+        '2.0': 'Etc/GMT-2',
+        '2.5': 'Etc/GMT-2',
+        '3.0': 'Etc/GMT-3',
+        '3.5': 'Etc/GMT-3',
+        '4.0': 'Etc/GMT-4',
+        '4.5': 'Asia/Kabul',
+        '5.0': 'Etc/GMT-5',
+        '5.5': 'Asia/Kolkata',
+        '6.0': 'Etc/GMT-6',
+        '6.5': 'Asia/Rangoon',
+        '7.0': 'Etc/GMT-7',
+        '7.5': 'Etc/GMT-7',
+        '8.0': 'Etc/GMT-8',
+        '8.5': 'Etc/GMT-8',
+        '9.0': 'Etc/GMT-9',
+        '9.5': 'Australia/Darwin',
+        '10.0': 'Etc/GMT-10',
+        '10.5': 'Etc/GMT-10',
+        '11.0': 'Etc/GMT-11',
+        '11.5': 'Etc/GMT-11',
+        '12.0': 'Etc/GMT-12',
+        '12.5': 'Etc/GMT-12',
+        '13.0': 'Etc/GMT-13',
+    };
+
     /**
      * Formats a user address, concatenating address, city and country.
      *
@@ -98,6 +155,16 @@ export class CoreUserHelperProvider {
         return (user.firstname?.charAt(0) || '') + (user.lastname?.charAt(0) || '');
     }
 
+    /**
+     * Translates legacy timezone names.
+     *
+     * @param tz Timezone name.
+     * @returns Readable timezone name.
+     */
+    translateLegacyTimezone(tz: string): string {
+        return CoreUserHelperProvider.LEGACY_TIMEZONES[tz] ?? tz;
+    }
+
 }
 
 export const CoreUserHelper = makeSingleton(CoreUserHelperProvider);