Remove usages of 'loc'

dodona-edu · Jan 24, 2024 · 8d1528a · 8d1528a
1 parent 8225f9b
commit 8d1528a
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 19 deletions.
diff --git a/app/assets/javascripts/coding_scratchpad.ts b/app/assets/javascripts/coding_scratchpad.ts
@@ -48,7 +48,7 @@ function initCodingScratchpad(programmingLanguage: ProgrammingLanguage): void {
                     {
                         programmingLanguage: Papyros.toProgrammingLanguage(programmingLanguage),
                         standAlone: false,
-                        locale: i18n.loc,
+                        locale: i18n.locale(),
                         inputMode: InputMode.Interactive,
                         channelOptions: {
                             serviceWorkerName: "inputServiceWorker.js"

diff --git a/app/assets/javascripts/i18n/i18n.ts b/app/assets/javascripts/i18n/i18n.ts
@@ -32,15 +32,7 @@ export class I18n extends Polyglot {
     constructor() {
         super();
         // set default locale, avoids a lot of errors when the locale is not yet set
-        this.loc = "en";
-    }
-
-    get loc(): string {
-        return this.locale();
-    }
-
-    set loc(locale: string) {
-        this.locale(locale);
+        this.locale("en");
     }
 
     /**
@@ -57,13 +49,13 @@ export class I18n extends Polyglot {
      * Polyglot does not do custom number formatting, thus we use the javascript api
      */
     formatNumber(number: number, options?: Record<string, unknown>): string {
-        return new Intl.NumberFormat(this.loc, options).format(number);
+        return new Intl.NumberFormat(this.locale(), options).format(number);
     }
 
     formatDate(date: string | number | Date | Dayjs, format: string): string {
         const d = dayjs(date);
         const f = super.t(format);
-        return d.locale(this.loc).format(f);
+        return d.locale(this.locale()).format(f);
     }
 }
 

diff --git a/app/assets/javascripts/state/SavedAnnotations.ts b/app/assets/javascripts/state/SavedAnnotations.ts
@@ -36,7 +36,7 @@ class SavedAnnotationState extends State {
     @stateProperty private byId = new StateMap<number, SavedAnnotation>();
 
     private get url(): string {
-        return `/${i18n.loc}${URL}`;
+        return `/${i18n.locale()}${URL}`;
     }
 
     private async fetchList(url: string): Promise<Array<SavedAnnotation>> {

diff --git a/app/assets/javascripts/utilities.ts b/app/assets/javascripts/utilities.ts
@@ -177,7 +177,7 @@ type DatePickerOptions = {
  */
 function initDatePicker(selector: string, options: DatePickerOptions = {}): object {
     function init(): object {
-        if (i18n.loc === "nl") {
+        if (i18n.locale() === "nl") {
             options.locale = Dutch;
         }
         return flatpickr(selector, options);

diff --git a/app/assets/javascripts/visualisations/series_graph.ts b/app/assets/javascripts/visualisations/series_graph.ts
@@ -103,7 +103,7 @@ export abstract class SeriesGraph {
     }
 
     private getUrl(): string {
-        return `/${i18n.loc}${this.baseUrl}${this.seriesId}`;
+        return `/${i18n.locale()}${this.baseUrl}${this.seriesId}`;
     }
 
 

diff --git a/app/views/activities/description.html.erb b/app/views/activities/description.html.erb
@@ -32,6 +32,6 @@
 </div>
 <script>
   i18n = dodona.i18n || {};
-  i18n.loc = "<%= I18n.locale %>";
+  i18n.locale("<%= I18n.locale %>");
   dodona.ready.then(() => window.dodona.initDescription());
 </script>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -54,7 +54,7 @@
 </div>
 <script>
   i18n = dodona.i18n || {};
-  i18n.loc = "<%= I18n.locale %>";
+  i18n.locale("<%= I18n.locale %>");
   dodona.checkTimeZone(<%= @time_zone_offset %>);
   dodona.checkIframe();
 </script>

diff --git a/app/views/layouts/lti.html.erb b/app/views/layouts/lti.html.erb
@@ -25,7 +25,7 @@
 <section class="toasts"></section>
 <script>
     i18n = dodona.i18n || {};
-    i18n.loc = "<%= I18n.locale %>";
+    i18n.locale("<%= I18n.locale %>");
     dodona.checkTimeZone(<%= @time_zone_offset %>);
 </script>
 </body>

diff --git a/test/javascript/visualisations.test.ts b/test/javascript/visualisations.test.ts
@@ -45,7 +45,7 @@ beforeAll(() => {
                 null, "Jan", "Feb", "Mrt", "Apr", "Mei", "Jun",
                 "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"]
         }[arg]) as string[]);
-    i18n.loc = "nl";
+    i18n.locale("nl");
 
 
     document.body.innerHTML = "" +
-Original file line number
+Diff line change
@@ Expand Up / @@ -103,7 +103,7 @@ export abstract class SeriesGraph { @@
         }
         private getUrl(): string {
-            return `/${i18n.loc}${this.baseUrl}${this.seriesId}`;
+            return `/${i18n.locale()}${this.baseUrl}${this.seriesId}`;
         }
@@ Expand Down @@