Merge pull request #884 from fredcw/timelet

[email protected] Mint 21.2 update
linuxmint · Jul 30, 2023 · f8039e5 · f8039e5
2 parents 88cdd35 + 8719f3a
commit f8039e5
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/[email protected]/files/[email protected]/desklet.js b/[email protected]/files/[email protected]/desklet.js
@@ -95,7 +95,8 @@ Timelet.prototype = {
         if (locale) {
             // convert $LANG from format "en_GB.UTF-8" to "en-GB"
             locale = GLib.getenv("LANG").replace(/_/g, "-").replace(/\..+/, "");
-        } else {
+        } 
+        if (!locale || locale === "C") {
             // fallback locale
             locale = "en-US";
         }
@@ -107,7 +108,8 @@ Timelet.prototype = {
         if (locale) {
             // convert $LANG from format "en_GB.UTF-8" to "en-GB"
             locale = GLib.getenv("LANG").replace(/_/g, "-").replace(/\..+/, "");
-        } else {
+        }
+        if (!locale || locale === "C") {
             // fallback locale
             locale = "en-US";
         }

diff --git a/[email protected]/files/[email protected]/themes/digital.js b/[email protected]/files/[email protected]/themes/digital.js
@@ -25,7 +25,7 @@ const Theme = imports.theme.Theme;
 /**
  * Digital theme class.
  */
-class DigitalTheme extends Theme {
+var DigitalTheme = class DigitalTheme extends Theme {
 
     constructor(config) {
         super(config);

diff --git a/[email protected]/files/[email protected]/themes/flair.js b/[email protected]/files/[email protected]/themes/flair.js
@@ -25,7 +25,7 @@ const Theme = imports.theme.Theme;
 /**
  * Flair theme class.
  */
-class FlairTheme extends Theme {
+var FlairTheme = class FlairTheme extends Theme {
 
     constructor(config) {
         super(config);

diff --git a/[email protected]/files/[email protected]/themes/gotham.js b/[email protected]/files/[email protected]/themes/gotham.js
@@ -25,7 +25,7 @@ const Theme = imports.theme.Theme;
 /**
  * Gotham theme class.
  */
-class GothamTheme extends Theme {
+var GothamTheme = class GothamTheme extends Theme {
 
     constructor(config) {
         super(config);

diff --git a/[email protected]/files/[email protected]/themes/jelly.js b/[email protected]/files/[email protected]/themes/jelly.js
@@ -25,7 +25,7 @@ const Theme = imports.theme.Theme;
 /**
  * Jelly theme class.
  */
- class JellyTheme extends Theme {
+var JellyTheme = class JellyTheme extends Theme {
 
     constructor(config) {
         super(config);

diff --git a/[email protected]/files/[email protected]/themes/metro.js b/[email protected]/files/[email protected]/themes/metro.js
@@ -25,7 +25,7 @@ const Theme = imports.theme.Theme;
 /**
  * Metro theme class.
  */
-class MetroTheme extends Theme {
+var MetroTheme = class MetroTheme extends Theme {
 
     constructor(config) {
         super(config);

diff --git a/[email protected]/files/[email protected]/themes/theme.js b/[email protected]/files/[email protected]/themes/theme.js
@@ -30,7 +30,7 @@ function _(str) {
 /**
  * This class is used to pass user configurations to themes.
  */
-class Config {
+var Config = class Config {
     constructor(scale, textColor) {
         this.scale = scale;
         this.textColor = textColor;
@@ -40,7 +40,7 @@ class Config {
 /**
  * The base Theme class. All themes must extend this class.
  */
-class Theme {
+var Theme = class Theme {
 
     /**
      * Timelet will parse the user input into a Config object and pass it to the theme.

diff --git a/[email protected]/files/[email protected]/themes/themes.js b/[email protected]/files/[email protected]/themes/themes.js
@@ -33,7 +33,7 @@ const MetroTheme = imports.metro.MetroTheme;
  * Step 2: Append your theme name to the `getThemeNames()` function list.
  * Step 3: Add an `else-if` condition to create your theme if the name matches the name you defined in Step 2.
  */
-class Themes {
+var Themes = class Themes {
 
     /**
      * This output will be used as the config GUI theme selector values.