Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-10 07:05:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix incorrect terminology for shield metrics. Fixes #5

Browse Source
This commit is contained in:
Cmdr McDonald
2017-02-18 09:07:18 +00:00
parent d73a3cc2b4
commit 8b9aae342b
5 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.md
View File

@@ -1,3 +1,6 @@
#2.2.17
* Use in-game terminology for shield generator optmul and optmass items
#2.2.16 #2.2.16
* Fix 'Extreme' blueprint roll where some incorrect ranges were chosen * Fix 'Extreme' blueprint roll where some incorrect ranges were chosen
* Use coriolis-data 2.2.16: * Use coriolis-data 2.2.16:

4
src/app/components/InternalSlot.jsx
View File

@@ -39,8 +39,8 @@ export default class InternalSlot extends Slot {
<div className={'r'}>{formats.round(mass)}{u.T}</div> <div className={'r'}>{formats.round(mass)}{u.T}</div>
</div> </div>
<div className={'cb'}> <div className={'cb'}>
{ m.getOptMass() ? <div className={'l'}>{translate('optimal mass')}: {formats.int(m.getOptMass())}{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('max mass')}: {formats.int(m.getMaxMass())}{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.bins ? <div className={'l'}>{m.bins} <u>{translate('bins')}</u></div> : null }
{ m.bays ? <div className={'l'}>{translate('bays')}: {m.bays}</div> : null } { m.bays ? <div className={'l'}>{translate('bays')}: {m.bays}</div> : null }
{ m.rebuildsperbay ? <div className={'l'}>{translate('rebuildsperbay')}: {m.rebuildsperbay}</div> : null } { m.rebuildsperbay ? <div className={'l'}>{translate('rebuildsperbay')}: {m.rebuildsperbay}</div> : null }

2
src/app/components/Modification.jsx
View File

@@ -81,7 +81,7 @@ export default class Modification extends TranslatedComponent {
return ( return (
<div className={'cb'} key={name}> <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)} /> <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> </div>
); );

4
src/app/i18n/Language.jsx
View File

@@ -34,9 +34,9 @@ export function getLanguage(langCode) {
let gen = d3Locale.numberFormat('n'); let gen = d3Locale.numberFormat('n');
if(lang === EN) { if(lang === EN) {
translate = (t) => { return currentTerms[t] || t; }; translate = (t, x) => { return currentTerms[t + '_' + x] || currentTerms[t] || t; };
} else { } 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 { return {

8
src/app/i18n/en.js
View File

@@ -189,6 +189,14 @@ export const terms = {
wepcap: 'Weapons capacity', wepcap: 'Weapons capacity',
weprate: 'Weapons recharge rate', 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
HELP_TEXT: ` HELP_TEXT: `
<h1>Introduction</h1> <h1>Introduction</h1>