refactor: Use toLocale{Upper|Lower}Case instead of to{Lower|Upper}Case

jonepatr · Jan 2, 2022 · b632cef · b632cef
1 parent 9e412cd
commit b632cef
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/module/handlebars.ts b/src/module/handlebars.ts
@@ -18,7 +18,7 @@ export default function registerHandlebarsHelpers(): void {
       return '';
     } else {
       const thing: string = str;
-      return str.charAt(0).toUpperCase() + (thing.length > 1 ? thing.slice(1) : "");
+      return str.charAt(0).toLocaleUpperCase() + (thing.length > 1 ? thing.slice(1) : "");
     }
   });
 
@@ -176,15 +176,15 @@ export default function registerHandlebarsHelpers(): void {
     const slice: TwodsixItem[] = <TwodsixItem[]>array?.slice(0);
     if (slice) {
       sortedArray = slice.sort((a, b) => {
-        if (a.name?.toLowerCase() == null) {
+        if (a.name == null) {
           return 1;
         } else {
-          if (b.name?.toLowerCase() == null) {
+          if (b.name == null) {
             return -1;
           } else if (a.name === b.name) {
             return 0;
           } else {
-            return a.name?.toLowerCase().localeCompare(b.name?.toLowerCase());
+            return a.name?.toLocaleLowerCase().localeCompare(b.name?.toLocaleLowerCase());
           }
         }
       });

diff --git a/src/module/hooks/showWoundIcons.ts b/src/module/hooks/showWoundIcons.ts
@@ -89,7 +89,7 @@ async function applyWoundedEffect(selectedToken: Record<string, any>): Promise<v
 async function setEffectState(effectLabel: string, targetToken: Record<string, any>, state: boolean): Promise<void> {
   const isAlreadySet = await targetToken.actor.effects.find(eff => eff.data.label === effectLabel);
   if ((typeof isAlreadySet !== 'undefined') !== state) {
-    const targetEffect = CONFIG.statusEffects.find(effect => (effect.id === effectLabel.toLowerCase()));
+    const targetEffect = CONFIG.statusEffects.find(effect => (effect.id === effectLabel.toLocaleLowerCase()));
     await targetToken.toggleEffect(targetEffect);
   }
 }

diff --git a/src/module/i18n.ts b/src/module/i18n.ts
@@ -1,7 +1,7 @@
 //I18n related helper functions
 
 export function advantageDisadvantageTerm(rollType:string):string {
-  switch (rollType.toLowerCase()) {
+  switch (rollType.toLocaleLowerCase()) {
     case "advantage":
       return (<string>game.settings.get('twodsix', 'termForAdvantage'));
     case "disadvantage":

diff --git a/src/module/sheets/TwodsixActorSheet.ts b/src/module/sheets/TwodsixActorSheet.ts
@@ -224,9 +224,9 @@ export class TwodsixActorSheet extends AbstractTwodsixActorSheet {
     } catch (err) {
       if (err.name === "TooLowQuantityError") {
         const refillAction = ["magazine", "power_cell"].includes((<Consumable>item.data.data).subtype) ? "Reload" : "Refill";
-        const refillWord = game.i18n.localize(`TWODSIX.Actor.Items.${refillAction}`).toLowerCase();
+        const refillWord = game.i18n.localize(`TWODSIX.Actor.Items.${refillAction}`).toLocaleLowerCase();
         const tooFewString = game.i18n.localize("TWODSIX.Errors.TooFewToReload");
-        ui.notifications.error(tooFewString.replace("_NAME_", item.name?.toLowerCase() || "???").replace("_REFILL_ACTION_", refillWord));
+        ui.notifications.error(tooFewString.replace("_NAME_", item.name?.toLocaleLowerCase() || "???").replace("_REFILL_ACTION_", refillWord));
       } else {
         throw err;
       }