From b8f2b7fb1fb59f930724a4e1c2dd7a2e07badc03 Mon Sep 17 00:00:00 2001
From: David Ralph <me@davidcralph.co.uk>
Date: Fri, 26 Aug 2022 11:44:24 +0100
Subject: [PATCH] fix(translations): fix issues caused by refactor

---
 src/components/modals/ErrorBoundary.jsx               |  6 +++---
 src/components/modals/main/settings/KeybindInput.jsx  |  8 +-------
 src/components/modals/main/settings/ResetModal.jsx    | 10 ++--------
 src/components/modals/main/settings/Slider.jsx        |  2 +-
 .../modals/main/settings/sections/Changelog.jsx       | 10 +++-------
 .../modals/main/settings/sections/Stats.jsx           | 10 +++-------
 src/components/widgets/background/Maximise.jsx        |  5 +----
 .../widgets/background/PhotoInformation.jsx           |  2 +-
 src/components/widgets/greeting/Greeting.jsx          |  6 +++---
 src/components/widgets/navbar/Navbar.jsx              | 10 ++--------
 src/components/widgets/navbar/Notes.jsx               |  5 +----
 src/components/widgets/navbar/Todo.jsx                |  5 +----
 src/components/widgets/weather/Weather.jsx            | 11 +++--------
 13 files changed, 25 insertions(+), 65 deletions(-)

diff --git a/src/components/modals/ErrorBoundary.jsx b/src/components/modals/ErrorBoundary.jsx
index ab586ee1..a39709ca 100644
--- a/src/components/modals/ErrorBoundary.jsx
+++ b/src/components/modals/ErrorBoundary.jsx
@@ -36,10 +36,10 @@ export default class ErrorBoundary extends PureComponent {
           <div className="emptyNewMessage">
             <MdErrorOutline />
             <span className="title">
-              {variables.getMessage(variables.languagecode, 'modals.main.error_boundary.title')}
+              {variables.getMessage('modals.main.error_boundary.title')}
             </span>
             <span className="subtitle">
-              {variables.getMessage(variables.languagecode, 'modals.main.error_boundary.message')}
+              {variables.getMessage('modals.main.error_boundary.message')}
             </span>
             <div className="buttonsRow">
               {this.state.showReport ? (
@@ -52,7 +52,7 @@ export default class ErrorBoundary extends PureComponent {
                 </span>
               )}
               <button className="refresh" onClick={() => window.location.reload()}>
-                {variables.getMessage(variables.languagecode, 'modals.main.error_boundary.refresh')}
+                {variables.getMessage('modals.main.error_boundary.refresh')}
               </button>
             </div>
           </div>
diff --git a/src/components/modals/main/settings/KeybindInput.jsx b/src/components/modals/main/settings/KeybindInput.jsx
index ee0d43e7..2c0ea195 100644
--- a/src/components/modals/main/settings/KeybindInput.jsx
+++ b/src/components/modals/main/settings/KeybindInput.jsx
@@ -16,13 +16,7 @@ export default function KeybindInput(props) {
           <MdCancel />
         </button>
       );
-    } else if (
-      value ===
-      variables.getMessage(
-        variables.languagecode,
-        'modals.main.settings.sections.keybinds.recording',
-      )
-    ) {
+    } else if (value === variables.getMessage('modals.main.settings.sections.keybinds.recording')) {
       return (
         <button className="cleanButton" onClick={() => props.action('cancel', props.setting)}>
           <MdCancel />
diff --git a/src/components/modals/main/settings/ResetModal.jsx b/src/components/modals/main/settings/ResetModal.jsx
index c946ee41..25df3182 100644
--- a/src/components/modals/main/settings/ResetModal.jsx
+++ b/src/components/modals/main/settings/ResetModal.jsx
@@ -25,16 +25,10 @@ export default function ResetModal({ modalClose }) {
         </Tooltip>
       </div>
       <span className="title">
-        {variables.getMessage(
-          variables.languagecode,
-          'modals.main.settings.sections.advanced.reset_modal.question',
-        )}
+        {variables.getMessage('modals.main.settings.sections.advanced.reset_modal.question')}
       </span>
       <span className="subtitle">
-        {variables.getMessage(
-          variables.languagecode,
-          'modals.main.settings.sections.advanced.reset_modal.information',
-        )}
+        {variables.getMessage('modals.main.settings.sections.advanced.reset_modal.information')}
       </span>
       <div className="resetFooter">
         <button className="textButton" onClick={modalClose}>
diff --git a/src/components/modals/main/settings/Slider.jsx b/src/components/modals/main/settings/Slider.jsx
index b6dd0aa6..ee7e728e 100644
--- a/src/components/modals/main/settings/Slider.jsx
+++ b/src/components/modals/main/settings/Slider.jsx
@@ -66,7 +66,7 @@ export default class SliderComponent extends PureComponent {
           <span>{Number(this.state.value)}</span>
           <span className="link" onClick={this.resetItem}>
             <MdRefresh />
-            {variables.getMessage(variables.languagecode, 'modals.main.settings.buttons.reset')}
+            {variables.getMessage('modals.main.settings.buttons.reset')}
           </span>
         </span>
         <Slider
diff --git a/src/components/modals/main/settings/sections/Changelog.jsx b/src/components/modals/main/settings/sections/Changelog.jsx
index 0d6cfd7d..f977ef4b 100644
--- a/src/components/modals/main/settings/sections/Changelog.jsx
+++ b/src/components/modals/main/settings/sections/Changelog.jsx
@@ -44,13 +44,9 @@ export default class Changelog extends PureComponent {
       title: data.title,
       date,
       image: data.featured_image || null,
-      author: variables.getMessage(
-        variables.languagecode,
-        'modals.main.settings.sections.changelog.by',
-        {
-          author: data.authors.join(', '),
-        },
-      ),
+      author: variables.getMessage('modals.main.settings.sections.changelog.by', {
+        author: data.authors.join(', '),
+      }),
       content: data.markdown,
     });
 
diff --git a/src/components/modals/main/settings/sections/Stats.jsx b/src/components/modals/main/settings/sections/Stats.jsx
index c9c778a7..268555e1 100644
--- a/src/components/modals/main/settings/sections/Stats.jsx
+++ b/src/components/modals/main/settings/sections/Stats.jsx
@@ -147,13 +147,9 @@ export default class Stats extends PureComponent {
             </span>
             <br />
             <span className="subtitle">
-              {variables.getMessage(
-                variables.languagecode,
-                'modals.main.settings.sections.stats.unlocked',
-                {
-                  count: this.getUnlockedCount() + '/' + this.state.achievements.length,
-                },
-              )}
+              {variables.getMessage('modals.main.settings.sections.stats.unlocked', {
+                count: this.getUnlockedCount() + '/' + this.state.achievements.length,
+              })}
             </span>
             <div className="achievements">
               {this.state.achievements.map((achievement, index) => {
diff --git a/src/components/widgets/background/Maximise.jsx b/src/components/widgets/background/Maximise.jsx
index 2adfb528..d4337b0c 100644
--- a/src/components/widgets/background/Maximise.jsx
+++ b/src/components/widgets/background/Maximise.jsx
@@ -70,10 +70,7 @@ export default class Maximise extends PureComponent {
   render() {
     return (
       <Tooltip
-        title={variables.getMessage(
-          variables.languagecode,
-          'modals.main.settings.sections.background.buttons.view',
-        )}
+        title={variables.getMessage('modals.main.settings.sections.background.buttons.view')}
       >
         <button>
           <MdCropFree onClick={this.maximise} className="topicons" />
diff --git a/src/components/widgets/background/PhotoInformation.jsx b/src/components/widgets/background/PhotoInformation.jsx
index 55fad9f4..625d4598 100644
--- a/src/components/widgets/background/PhotoInformation.jsx
+++ b/src/components/widgets/background/PhotoInformation.jsx
@@ -50,7 +50,7 @@ export default function PhotoInformation({ info, url, api }) {
   }
 
   // remove unsplash and pexels text
-  const unsplash = variables.getMessage(variables.languagecode, 'widgets.background.unsplash');
+  const unsplash = variables.getMessage('widgets.background.unsplash');
   const pexels = variables.getMessage('widgets.background.pexels');
 
   let credit = info.credit;
diff --git a/src/components/widgets/greeting/Greeting.jsx b/src/components/widgets/greeting/Greeting.jsx
index d9bb71f8..b5f504b3 100644
--- a/src/components/widgets/greeting/Greeting.jsx
+++ b/src/components/widgets/greeting/Greeting.jsx
@@ -56,13 +56,13 @@ export default class Greeting extends PureComponent {
       const hour = now.getHours();
 
       // Set the default greeting string to "Good evening"
-      let message = variables.getMessage(variables.languagecode, 'widgets.greeting.evening');
+      let message = variables.getMessage('widgets.greeting.evening');
       // If it's before 12am, set the greeting string to "Good morning"
       if (hour < 12) {
         message = variables.getMessage('widgets.greeting.morning');
         // If it's before 6pm, set the greeting string to "Good afternoon"
       } else if (hour < 18) {
-        message = variables.getMessage(variables.languagecode, 'widgets.greeting.afternoon');
+        message = variables.getMessage('widgets.greeting.afternoon');
       }
 
       // Events and custom
@@ -100,7 +100,7 @@ export default class Greeting extends PureComponent {
               .split(' ');
             message = `${text[0]} ${nth(this.calculateAge(birth))} ${text[1]}`;
           } else {
-            message = variables.getMessage(variables.languagecode, 'widgets.greeting.birthday');
+            message = variables.getMessage('widgets.greeting.birthday');
           }
         }
       }
diff --git a/src/components/widgets/navbar/Navbar.jsx b/src/components/widgets/navbar/Navbar.jsx
index 8cd8a206..8233de8d 100644
--- a/src/components/widgets/navbar/Navbar.jsx
+++ b/src/components/widgets/navbar/Navbar.jsx
@@ -70,12 +70,7 @@ export default class Navbar extends PureComponent {
           {localStorage.getItem('todo') === 'true' ? <Todo /> : null}
 
           {this.refreshEnabled !== 'false' ? (
-            <Tooltip
-              title={variables.getMessage(
-                variables.languagecode,
-                'widgets.navbar.tooltips.refresh',
-              )}
-            >
+            <Tooltip title={variables.getMessage('widgets.navbar.tooltips.refresh')}>
               <button onClick={() => this.refresh()}>
                 <MdRefresh className="refreshicon topicons" />
               </button>
@@ -90,9 +85,8 @@ export default class Navbar extends PureComponent {
               >
               </InfoTooltip>*/}
           <Tooltip
-            title={variables.getMessage(variables.languagecode, 'modals.main.navbar.settings', {
+            title={variables.getMessage('modals.main.navbar.settings', {
               type: variables.getMessage(
-                variables.languagecode,
                 'modals.main.navbar.tooltips.refresh_' + this.refreshValue,
               ),
             })}
diff --git a/src/components/widgets/navbar/Notes.jsx b/src/components/widgets/navbar/Notes.jsx
index 1273bc2f..f2612f55 100644
--- a/src/components/widgets/navbar/Notes.jsx
+++ b/src/components/widgets/navbar/Notes.jsx
@@ -119,10 +119,7 @@ class Notes extends PureComponent {
                 </Tooltip>
               </div>
               <TextareaAutosize
-                placeholder={variables.getMessage(
-                  variables.languagecode,
-                  'widgets.navbar.notes.placeholder',
-                )}
+                placeholder={variables.getMessage('widgets.navbar.notes.placeholder')}
                 value={this.state.notes}
                 onChange={this.setNotes}
                 minRows={5}
diff --git a/src/components/widgets/navbar/Todo.jsx b/src/components/widgets/navbar/Todo.jsx
index e6a6fcce..d4ba8b34 100644
--- a/src/components/widgets/navbar/Todo.jsx
+++ b/src/components/widgets/navbar/Todo.jsx
@@ -179,10 +179,7 @@ class Todo extends PureComponent {
                             onClick={() => this.updateTodo('done', index)}
                           />
                           <TextareaAutosize
-                            placeholder={variables.getMessage(
-                              variables.languagecode,
-                              'widgets.navbar.notes.placeholder',
-                            )}
+                            placeholder={variables.getMessage('widgets.navbar.notes.placeholder')}
                             value={this.state.todo[index].value}
                             onChange={(data) => this.updateTodo('set', index, data)}
                             readOnly={this.state.todo[index].done}
diff --git a/src/components/widgets/weather/Weather.jsx b/src/components/widgets/weather/Weather.jsx
index 7ff4f4d7..d2bbfdf2 100644
--- a/src/components/widgets/weather/Weather.jsx
+++ b/src/components/widgets/weather/Weather.jsx
@@ -74,7 +74,7 @@ export default class Weather extends PureComponent {
 
     if (data.cod === '404') {
       return this.setState({
-        location: variables.getMessage(variables.languagecode, 'widgets.weather.not_found'),
+        location: variables.getMessage('widgets.weather.not_found'),
       });
     }
 
@@ -187,13 +187,12 @@ export default class Weather extends PureComponent {
         <div className="expanded-info">
           {weatherType >= 3 && (
             <span className="subtitle">
-              {variables.getMessage(variables.languagecode, 'widgets.weather.extra_information')}
+              {variables.getMessage('widgets.weather.extra_information')}
             </span>
           )}
           {enabled('cloudiness') ? (
             <Tooltip
               title={variables.getMessage(
-                variables.languagecode,
                 'modals.main.settings.sections.weather.extra_info.cloudiness',
               )}
               placement="left"
@@ -207,7 +206,6 @@ export default class Weather extends PureComponent {
           {enabled('windspeed') ? (
             <Tooltip
               title={variables.getMessage(
-                variables.languagecode,
                 'modals.main.settings.sections.weather.extra_info.wind_speed',
               )}
               placement="left"
@@ -230,7 +228,6 @@ export default class Weather extends PureComponent {
           {enabled('atmosphericpressure') ? (
             <Tooltip
               title={variables.getMessage(
-                variables.languagecode,
                 'modals.main.settings.sections.weather.extra_info.atmospheric_pressure',
               )}
               placement="left"
@@ -245,7 +242,6 @@ export default class Weather extends PureComponent {
           {enabled('weatherdescription') ? (
             <Tooltip
               title={variables.getMessage(
-                variables.languagecode,
                 'modals.main.settings.sections.weather.extra_info.show_description',
               )}
               placement="left"
@@ -261,7 +257,6 @@ export default class Weather extends PureComponent {
           {enabled('visibility') ? (
             <Tooltip
               title={variables.getMessage(
-                variables.languagecode,
                 'modals.main.settings.sections.weather.extra_info.visibility',
               )}
               placement="left"
@@ -294,7 +289,7 @@ export default class Weather extends PureComponent {
             <div className="extra-info">
               {/*{enabled('humidity') ? <span><WiHumidity/>{this.state.weather.humidity}%</span> : null}*/}
               <span>
-                {variables.getMessage(variables.languagecode, 'widgets.weather.feels_like', {
+                {variables.getMessage('widgets.weather.feels_like', {
                   amount: this.state.weather.temp_feels_like + this.state.temp_text,
                 })}
               </span>