From 0d864b67c1505c596fdaaca5b75500c61a623d56 Mon Sep 17 00:00:00 2001
From: Johannes Loher <johannes.loher@fg4f.de>
Date: Wed, 17 Mar 2021 19:23:57 +0100
Subject: [PATCH] Use foundry vtt provided rollmode labels

---
 src/lang/de.json                    |  4 ----
 src/lang/en.json                    |  4 ----
 src/module/config.ts                | 10 ----------
 src/module/rolls/check-factory.ts   |  6 +++---
 src/templates/roll/roll-options.hbs |  6 +++---
 5 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/lang/de.json b/src/lang/de.json
index bf89e0fb..4bc08249 100644
--- a/src/lang/de.json
+++ b/src/lang/de.json
@@ -229,10 +229,6 @@
     "DS4.RollDialogCoupLabel": "Immersieg bis",
     "DS4.RollDialogFumbleLabel": "Patzer ab",
     "DS4.RollDialogVisibilityLabel": "Sichtbarkeit",
-    "DS4.ChatVisibilityRoll": "Alle",
-    "DS4.ChatVisibilityGmRoll": "Selbst & SL",
-    "DS4.ChatVisibilityBlindRoll": "Nur SL",
-    "DS4.ChatVisibilitySelfRoll": "Nur selbst",
     "DS4.TooltipBaseValue": "Basiswert",
     "DS4.TooltipModifier": "Modifikator",
     "DS4.TooltipEffects": "Effekte"
diff --git a/src/lang/en.json b/src/lang/en.json
index 93011357..2454030b 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -229,10 +229,6 @@
     "DS4.RollDialogCoupLabel": "Coup to",
     "DS4.RollDialogFumbleLabel": "Fumble from",
     "DS4.RollDialogVisibilityLabel": "Visibility",
-    "DS4.ChatVisibilityRoll": "All",
-    "DS4.ChatVisibilityGmRoll": "Self & GM",
-    "DS4.ChatVisibilityBlindRoll": "GM only",
-    "DS4.ChatVisibilitySelfRoll": "Self only",
     "DS4.TooltipBaseValue": "Base Value",
     "DS4.TooltipModifier": "Modifier",
     "DS4.TooltipEffects": "Effects"
diff --git a/src/module/config.ts b/src/module/config.ts
index caf0f147..ead4be51 100644
--- a/src/module/config.ts
+++ b/src/module/config.ts
@@ -281,16 +281,6 @@ export const DS4 = {
             days: "DS4.UnitDaysAbbr",
             custom: "DS4.UnitCustomAbbr",
         },
-
-        /**
-         * Define localization strings for Chat Visibility
-         */
-        chatVisibilities: {
-            roll: "DS4.ChatVisibilityRoll",
-            gmroll: "DS4.ChatVisibilityGmRoll",
-            blindroll: "DS4.ChatVisibilityBlindRoll",
-            selfroll: "DS4.ChatVisibilitySelfRoll",
-        },
     },
 
     /**
diff --git a/src/module/rolls/check-factory.ts b/src/module/rolls/check-factory.ts
index bdf9a867..76f1a348 100644
--- a/src/module/rolls/check-factory.ts
+++ b/src/module/rolls/check-factory.ts
@@ -116,7 +116,7 @@ async function askGmModifier(
         maxCritSuccess: options.maxCritSuccess ?? defaultCheckOptions.maxCritSuccess,
         minCritFailure: options.minCritFailure ?? defaultCheckOptions.minCritFailure,
         rollMode: options.rollMode,
-        config: DS4,
+        rollModes: CONFIG.Dice.rollModes,
     };
     const renderedHtml = await renderTemplate(usedTemplate, templateData);
 
@@ -195,7 +195,7 @@ interface GmModifierData {
  *  - checkTargetValue
  *
  * They will and should be removed once effects and data retrieval is in place.
- * If a "raw" roll dialog is necessary, create another pre-porcessing Dialog
+ * If a "raw" roll dialog is necessary, create another pre-processing Dialog
  * class asking for the required information.
  * This interface should then be replaced with the `GmModifierData`.
  */
@@ -210,7 +210,7 @@ interface IntermediateGmModifierData extends GmModifierData {
 }
 
 /**
- * The minimum behavioural options that need to be passed to the factory.
+ * The minimum behavioral options that need to be passed to the factory.
  */
 export interface DS4CheckFactoryOptions {
     maxCritSuccess: number;
diff --git a/src/templates/roll/roll-options.hbs b/src/templates/roll/roll-options.hbs
index 6db4e245..217c4cf3 100644
--- a/src/templates/roll/roll-options.hbs
+++ b/src/templates/roll/roll-options.hbs
@@ -10,9 +10,9 @@
     <label for="visibility">{{localize "DS4.RollDialogVisibilityLabel"}}</label>
     <select id="visibility" data-type="String">
         {{#select rollMode}}
-        {{#each config.i18n.chatVisibilities as |rollModeValue rollModeKey|}}
-        <option value="{{rollModeKey}}">{{rollModeValue}}</option>
+        {{#each rollModes as |rollModeValue rollModeKey|}}
+        <option value="{{rollModeKey}}">{{localize rollModeValue}}</option>
         {{/each}}
         {{/select}}
     </select>
-</form>
\ No newline at end of file
+</form>