diff --git a/module/rdd-utility.js b/module/rdd-utility.js index ed0962d0..8e9ed24a 100644 --- a/module/rdd-utility.js +++ b/module/rdd-utility.js @@ -265,12 +265,12 @@ export class RdDUtility { Handlebars.registerHelper('either', (a, b) => a ?? b); Handlebars.registerHelper('upperFirst', str => Misc.upperFirst(str ?? 'Null')); Handlebars.registerHelper('lowerFirst', str => Misc.lowerFirst(str ?? 'Null')); - Handlebars.registerHelper('upper', str => str?.toUpperCase() ?? ''); + Handlebars.registerHelper('uppercase', str => str?.toUpperCase() ?? ''); Handlebars.registerHelper('lowercase', str => str?.toLowerCase() ?? ''); - Handlebars.registerHelper('le', str => Grammar.articleDetermine(str)); - Handlebars.registerHelper('apostrophe', (article, str) => Grammar.apostrophe(article, str)); - Handlebars.registerHelper('un', str => Grammar.articleIndetermine(str)); - Handlebars.registerHelper('accord', (genre, ...args) => Grammar.accord(genre, args)); + Handlebars.registerHelper('grammar-le', str => Grammar.articleDetermine(str)); + Handlebars.registerHelper('grammar-apostrophe', (article, str) => Grammar.apostrophe(article, str)); + Handlebars.registerHelper('grammar-un', str => Grammar.articleIndetermine(str)); + Handlebars.registerHelper('grammar-accord', (genre, ...args) => Grammar.accord(genre, args)); Handlebars.registerHelper('RDD_CONFIG', path => RDD_CONFIG[path]) Handlebars.registerHelper('computeResolutionScore', (row, col) => RdDResolutionTable.computePercentage(row, col)); diff --git a/templates/actor/export-scriptarium/carac-compteur.hbs b/templates/actor/export-scriptarium/carac-compteur.hbs index 0d81f2de..a41b06f9 100644 --- a/templates/actor/export-scriptarium/carac-compteur.hbs +++ b/templates/actor/export-scriptarium/carac-compteur.hbs @@ -2,10 +2,10 @@
{{#if carac.rollClass}} - {{upper carac.colName}} + {{uppercase carac.colName}} {{else}} - {{upper carac.colName}} + {{uppercase carac.colName}} {{/if}} diff --git a/templates/actor/export-scriptarium/carac.hbs b/templates/actor/export-scriptarium/carac.hbs index bc5b3e3f..e5ef411b 100644 --- a/templates/actor/export-scriptarium/carac.hbs +++ b/templates/actor/export-scriptarium/carac.hbs @@ -1,9 +1,9 @@
{{#if carac.rollClass}} - {{upper carac.colName}} + {{uppercase carac.colName}} {{else}} - {{upper carac.colName}} + {{uppercase carac.colName}} {{/if}}
{{carac.value}}
diff --git a/templates/chat-resultat-maitrise-tmr.html b/templates/chat-resultat-maitrise-tmr.html index 54415d36..80ecac9c 100644 --- a/templates/chat-resultat-maitrise-tmr.html +++ b/templates/chat-resultat-maitrise-tmr.html @@ -1,6 +1,6 @@

- {{alias}} tente de {{maitrise.verbe}} {{le tmr.genre}} + {{alias}} tente de {{maitrise.verbe}} {{grammar-le tmr.genre}} {{#if isTMRCache}} {{caseTmr-type tmr.coord}} {{else}} @@ -18,7 +18,7 @@ {{alias}} {{#if rolled.isSuccess}}parvient à{{else}}échoue à{{/if}} - {{maitrise.verbe}} {{le tmr.genre}} + {{maitrise.verbe}} {{grammar-le tmr.genre}} {{#if isTMRCache}} {{caseTmr-type tmr.coord}} {{else}} diff --git a/templates/chat-resultat-meteo.html b/templates/chat-resultat-meteo.html index 4598735f..93d85fd3 100644 --- a/templates/chat-resultat-meteo.html +++ b/templates/chat-resultat-meteo.html @@ -1,8 +1,8 @@

Météo aléatoire

    -
  • Vent: {{lowerFirst vent.description}} {{apostrophe 'de' vent.direction}}, force {{vent.force}}
  • -
  • Mer {{lowerFirst mer.description}}, {{apostrophe 'de' mer.direction}}, force {{mer.force}}
  • +
  • Vent: {{lowerFirst vent.description}} {{grammar-apostrophe 'de' vent.direction}}, force {{vent.force}}
  • +
  • Mer {{lowerFirst mer.description}}, {{grammar-apostrophe 'de' mer.direction}}, force {{mer.force}}
  • Température {{lowerFirst temperature.description}} ({{plusMoins temperature.force}})
  • Couverture nuageuse: {{lowerFirst nuage.description}}
  • Pluie: {{lowerFirst pluie.description}}