From 8b9aae342bd3a01d8ff6849743170778f59f6e92 Mon Sep 17 00:00:00 2001
From: Cmdr McDonald <Cmdr.McDonald@gmail.com>
Date: Sat, 18 Feb 2017 09:07:18 +0000
Subject: [PATCH] Fix incorrect terminology for shield metrics.  Fixes #5

---
 ChangeLog.md                        | 3 +++
 src/app/components/InternalSlot.jsx | 4 ++--
 src/app/components/Modification.jsx | 2 +-
 src/app/i18n/Language.jsx           | 4 ++--
 src/app/i18n/en.js                  | 8 ++++++++
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index bc978526..9eb1b810 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,6 @@
+#2.2.17
+  * Use in-game terminology for shield generator optmul and optmass items
+
 #2.2.16
   * Fix 'Extreme' blueprint roll where some incorrect ranges were chosen
   * Use coriolis-data 2.2.16:
diff --git a/src/app/components/InternalSlot.jsx b/src/app/components/InternalSlot.jsx
index be88fceb..fd38701e 100644
--- a/src/app/components/InternalSlot.jsx
+++ b/src/app/components/InternalSlot.jsx
@@ -39,8 +39,8 @@ export default class InternalSlot extends Slot {
           <div className={'r'}>{formats.round(mass)}{u.T}</div>
         </div>
         <div className={'cb'}>
-          { m.getOptMass() ? <div className={'l'}>{translate('optimal mass')}: {formats.int(m.getOptMass())}{u.T}</div> : null }
-          { m.getMaxMass() ? <div className={'l'}>{translate('max mass')}: {formats.int(m.getMaxMass())}{u.T}</div> : null }
+          { m.getOptMass() ? <div className={'l'}>{translate('optmass', m.grp)}: {formats.int(m.getOptMass())}{u.T}</div> : null }
+          { m.getMaxMass() ? <div className={'l'}>{translate('maxmass', m.grp)}: {formats.int(m.getMaxMass())}{u.T}</div> : null }
           { m.bins ? <div className={'l'}>{m.bins} <u>{translate('bins')}</u></div> : null }
           { m.bays ? <div className={'l'}>{translate('bays')}: {m.bays}</div> : null }
           { m.rebuildsperbay ? <div className={'l'}>{translate('rebuildsperbay')}: {m.rebuildsperbay}</div> : null }
diff --git a/src/app/components/Modification.jsx b/src/app/components/Modification.jsx
index 357a2df7..9b7a53b9 100644
--- a/src/app/components/Modification.jsx
+++ b/src/app/components/Modification.jsx
@@ -81,7 +81,7 @@ export default class Modification extends TranslatedComponent {
 
     return (
       <div className={'cb'} key={name}>
-        <div className={'cb'}>{translate(name)}{symbol}</div>
+        <div className={'cb'}>{translate(name, m.grp)}{symbol}</div>
         <NumberEditor className={'cb'} style={{ width: '90%', textAlign: 'center' }} step={0.01} stepModifier={1} decimals={2} value={this.state.value} onValueChange={this._updateValue.bind(this)} />
       </div>
     );
diff --git a/src/app/i18n/Language.jsx b/src/app/i18n/Language.jsx
index 4fbac2e4..57d26b67 100644
--- a/src/app/i18n/Language.jsx
+++ b/src/app/i18n/Language.jsx
@@ -34,9 +34,9 @@ export function getLanguage(langCode) {
   let gen = d3Locale.numberFormat('n');
 
   if(lang === EN) {
-    translate = (t) => { return currentTerms[t] || t; };
+    translate = (t, x) => { return currentTerms[t + '_' + x] || currentTerms[t] || t; };
   } else {
-    translate = (t) => { return currentTerms[t] || fallbackTerms[t] || t; };
+    translate = (t, x) => { return currentTerms[t + '_' + x] || currentTerms[t] || fallbackTerms[t + '_' + x] || fallbackTerms[t] || t; };
   }
 
   return {
diff --git a/src/app/i18n/en.js b/src/app/i18n/en.js
index a296c55f..dc04c526 100644
--- a/src/app/i18n/en.js
+++ b/src/app/i18n/en.js
@@ -189,6 +189,14 @@ export const terms = {
   wepcap: 'Weapons capacity',
   weprate: 'Weapons recharge rate',
 
+  // Shield generators use a different terminology
+  minmass_sg: 'Minimum hull mass',
+  optmass_sg: 'Optimal hull mass',
+  maxmass_sg: 'Maximum hull mass',
+  minmul_sg: 'Minimum strength',
+  optmul_sg: 'Optimal strength',
+  maxmul_sg: 'Minimum strength',
+
   // Help text
   HELP_TEXT: `
 <h1>Introduction</h1>