ENH: Rolls localization

src/lang/en.json

@@ -18,17 +18,19 @@
   "OSE.Modifiers": "Modifiers",
   "OSE.RollMode": "Roll Mode",
   "OSE.RollExample": "e.g. +1d4",
-  "OSE.RollFormula": "{label} roll",
 
+  "OSE.roll.formula": "{label} roll",
   "OSE.roll.appearing": "Appearing roll",
   "OSE.roll.morale": "Morale check",
   "OSE.roll.hd": "Hit Dice roll",
-  "OSE.roll.attackWith": "Attacks with {name}",
+  "OSE.roll.attacksWith": "Attacks with {name}",
   "OSE.roll.attacks": "{name} attacks!",
-  "OSE.roll.save": "Save",
+  "OSE.roll.save": "{save} Save",
-  "OSE.roll.attribute": "Attribute check",
+  "OSE.roll.details.save": "Roll 1d20 >= {save} for success",
+  "OSE.roll.attribute": "{attribute} check",
   "OSE.roll.details.attribute": "Roll 1d20 <= {score} for success",
-  "OSE.roll.exploration": "Test",
+  "OSE.roll.exploration": "{exploration} test",
+  "OSE.roll.details.exploration": "Roll 1d6 <= {expl} for success",
   "OSE.roll.reaction": "Reaction roll",
 
   "OSE.details.name": "Name",
@@ -56,7 +58,6 @@
   "OSE.Loyalty": "Loyalty Rating",
   "OSE.LoyaltyShort": "LR",
 
-  "OSE.scores.details": "Roll 1d20 <= {score} for success",
   "OSE.scores.str.long": "Strength",
   "OSE.scores.str.short": "STR",
   "OSE.scores.wis.long": "Wisdom",
@@ -70,7 +71,6 @@
   "OSE.scores.cha.long": "Charisma",
   "OSE.scores.cha.short": "CHA",
 
-  "OSE.saves.details": "Roll 1d20 >= {save} for success",
   "OSE.saves.death.short": "D",
   "OSE.saves.death.long": "Death Poison",
   "OSE.saves.wand.short": "W",
@@ -201,8 +201,6 @@
 
   "OSE.abilities.Requirements": "Requirements",
 
-  "OSE.exploration.check": "Check",
-  "OSE.exploration.details": "Roll 1d6 <= {expl} for success",
   "OSE.exploration.ld.long": "Listen at Door",
   "OSE.exploration.ld.short": "Listen Door",
   "OSE.exploration.ld.abrev": "LD",

src/lang/fr.json

@@ -10,24 +10,26 @@
   "OSE.Success": "Succès",
   "OSE.Failure": "Échec",
 
-  "OSE.dialog.tweaks": "Ajustements",
+  "OSE.dialog.tweaks": "Ajuster",
 
   "OSE.Formula": "Formule",
   "OSE.SitMod": "Mod. de situation",
   "OSE.Modifier": "Modificateur",
   "OSE.RollMode": "Mode de Jet",
   "OSE.RollExample": "ex. +1d4",
-  "OSE.RollFormula": "Lancer de {label}",
 
+  "OSE.roll.formula": "Jet de {label}",
   "OSE.roll.appearing": "Nombre Apparaissant",
   "OSE.roll.morale": "Jet de Moral",
   "OSE.roll.hd": "Lancer de Dé de Vie",
-  "OSE.roll.attackWith": "Attacks with {name}",
+  "OSE.roll.attacksWith": "Attaque avec {name}",
-  "OSE.roll.attacks": "{name} attacks!",
+  "OSE.roll.attacks": "{name} attaque !",
-  "OSE.roll.save": "Sauvegarde",
+  "OSE.roll.save": "Sauv. de {save}",
-  "OSE.roll.attribute": "Jet de Caractéristique",
+  "OSE.roll.details.save": "Lancez 1d20 >= {save} pour réussir",
+  "OSE.roll.attribute": "Jet de {attribute}",
   "OSE.roll.details.attribute": "Lancez 1d20 <= {score} pour réussir",
-  "OSE.roll.exploration": "Test",
+  "OSE.roll.exploration": "Test de {exploration}",
+  "OSE.roll.details.exploration": "Lancez 1d6 <= {expl} pour réussir",
   "OSE.roll.reaction": "Jet de Réaction",
 
   "OSE.details.name": "Nom",
@@ -68,7 +70,6 @@
   "OSE.scores.cha.long": "Charisme",
   "OSE.scores.cha.short": "CHA",
 
-  "OSE.saves.details": "Lancez 1d20 >= {save} pour réussir",
   "OSE.saves.death.short": "MP",
   "OSE.saves.death.long": "Mort Poison",
   "OSE.saves.wand.short": "B",
@@ -107,7 +108,7 @@
   "OSE.MeleeShort": "MEL",
   "OSE.Melee": "Mêlée",
   "OSE.MeleeBonus": "Bonus de Mêlée",
-  "OSE.MissileShort": "PROJ",
+  "OSE.MissileShort": "PRO",
   "OSE.Missile": "Projectiles",
   "OSE.MissileBonus": "Bonus de Projectile",
   "OSE.Initiative": "Initiative",
@@ -197,7 +198,6 @@
 
   "OSE.abilities.Requirements": "Prérequis",
 
-  "OSE.exploration.details": "Lancer 1d6 <= {expl} pour réussir",
   "OSE.exploration.ld.long": "Ecoute aux Portes",
   "OSE.exploration.ld.short": "Eco. Porte",
   "OSE.exploration.ld.abrev": "EP",

src/module/actor/entity.js

@@ -73,7 +73,7 @@ export class OseActor extends Actor {
         rollData: {
           type: "Above",
           target: this.data.data.saves[save].value,
-          details: game.i18n.format("OSE.saves.details", { save: label }),
+          details: game.i18n.format("OSE.roll.details.save", { save: label }),
         },
       },
     };
@@ -87,8 +87,8 @@ export class OseActor extends Actor {
       data: data,
       skipDialog: skip,
       speaker: ChatMessage.getSpeaker({ actor: this }),
-      flavor: `${label} ${game.i18n.localize("OSE.roll.save")}`,
+      flavor: game.i18n.format("OSE.roll.save", { save: label }),
-      title: `${label} ${game.i18n.localize("OSE.roll.save")}`,
+      title: game.i18n.format("OSE.roll.save", { save: label }),
     });
   }
 
@@ -197,7 +197,7 @@ export class OseActor extends Actor {
         rollData: {
           type: "Check",
           target: this.data.data.scores[score].value,
-          details: game.i18n.format("OSE.scores.details", {
+          details: game.i18n.format("OSE.roll.details.attribute", {
             score: label,
           }),
         },
@@ -213,8 +213,8 @@ export class OseActor extends Actor {
       data: data,
       skipDialog: skip,
       speaker: ChatMessage.getSpeaker({ actor: this }),
-      flavor: `${label} ${game.i18n.localize("OSE.roll.attribute")}`,
+      flavor: game.i18n.format("OSE.roll.attribute", {attribute: label}),
-      title: `${label} ${game.i18n.localize("OSE.roll.attribute")}`,
+      title: game.i18n.format("OSE.roll.attribute", {attribute: label}),
     });
   }
 
@@ -269,8 +269,8 @@ export class OseActor extends Actor {
       data: data,
       skipDialog: true,
       speaker: ChatMessage.getSpeaker({ actor: this }),
-      flavor: `${game.i18n.localize('OSE.appearing.check')} ${label}`,
+      flavor: game.i18n.localize('OSE.roll.appearing'),
-      title: `${game.i18n.localize('OSE.appearing.check')} ${label}`,
+      title: game.i18n.localize('OSE.roll.appearing'),
     });
   }
 
@@ -284,7 +284,7 @@ export class OseActor extends Actor {
         rollData: {
           type: "Below",
           target: this.data.data.exploration[expl],
-          details: game.i18n.format("OSE.exploration.details", {
+          details: game.i18n.format("OSE.roll.details.exploration", {
             expl: label,
           }),
         },
@@ -300,8 +300,8 @@ export class OseActor extends Actor {
       data: data,
       skipDialog: skip,
       speaker: ChatMessage.getSpeaker({ actor: this }),
-      flavor: `${label} ${game.i18n.localize("OSE.roll.exploration")}`,
+      flavor: game.i18n.format("OSE.roll.exploration", {exploration: label}),
-      title: `${label} ${game.i18n.localize("OSE.roll.exploration")}`,
+      title: game.i18n.format("OSE.roll.exploration", {exploration: label}),
     });
   }
 
@@ -350,7 +350,7 @@ export class OseActor extends Actor {
     const data = this.data.data;
     const rollParts = ["1d20"];
     const dmgParts = [];
-
+    let label = game.i18n.format('OSE.roll.attacks', {name: this.data.name})
     if (
       !attData.dmg ||
       (!game.settings.get("ose", "variableWeaponDamage") &&
@@ -358,6 +358,7 @@ export class OseActor extends Actor {
     ) {
       dmgParts.push("1d6");
     } else {
+      label = game.i18n.format('OSE.roll.attacksWith', {name: attData.label})
       dmgParts.push(attData.dmg);
     }
 
@@ -405,8 +406,8 @@ export class OseActor extends Actor {
       data: rollData,
       skipDialog: skip,
       speaker: ChatMessage.getSpeaker({ actor: this }),
-      flavor: `${attData.label} - ${game.i18n.localize("OSE.Attack")}`,
+      flavor: label,
-      title: `${attData.label} - ${game.i18n.localize("OSE.Attack")}`,
+      title: label,
     });
   }
 

src/module/item/entity.js

@@ -126,8 +126,8 @@ export class OseItem extends Item {
       data: data,
       skipDialog: true,
       speaker: ChatMessage.getSpeaker({ actor: this }),
-      flavor: game.i18n.format("OSE.RollFormula", {label: label}),
+      flavor: game.i18n.format("OSE.roll.formula", {label: label}),
-      title: game.i18n.format("OSE.RollFormula", {label: label}),
+      title: game.i18n.format("OSE.roll.formula", {label: label}),
     });
   }