From 3501dbf027a1be6f1480720b5b92c59d231b4655 Mon Sep 17 00:00:00 2001 From: GihHubSphinx Date: Fri, 26 Jun 2015 20:49:35 +0500 Subject: [PATCH 1/6] Make gear attributes translatable in stats --- common/locales/en/character.json | 6 +++++- website/views/shared/profiles/stats.jade | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/common/locales/en/character.json b/common/locales/en/character.json index f648ded61e..935392e455 100644 --- a/common/locales/en/character.json +++ b/common/locales/en/character.json @@ -147,5 +147,9 @@ "mageWiki": "Mage", "rogueWiki": "Rogue", "healerWiki": "Healer", - "chooseClassLearn": "Learn more about classes" + "chooseClassLearn": "Learn more about classes", + "str": "STR", + "con": "CON", + "per": "PER", + "int": "INT" } diff --git a/website/views/shared/profiles/stats.jade b/website/views/shared/profiles/stats.jade index 476c114143..b2583c0e0b 100644 --- a/website/views/shared/profiles/stats.jade +++ b/website/views/shared/profiles/stats.jade @@ -28,7 +28,7 @@ unless mobile tr(ng-repeat='(k,v) in profile.items.gear.equipped', ng-init='piece=Content.gear.flat[v]', ng-show='piece') td strong {{piece.text()}}:  - span(ng-repeat='stat in ["str","con","per","int"]', ng-show='piece[stat]') {{piece[stat]}} {{stat.toUpperCase()}}  + span(ng-repeat='stat in ["str","con","per","int"]', ng-show='piece[stat]') {{piece[stat]}} {{env.t(stat)}}  h4(class=mobile?'item item-divider':'')=env.t('attributes') table.table.table-striped From c2f0f89f2bfd9a00b772fa61b107eefbb914ddf5 Mon Sep 17 00:00:00 2001 From: GihHubSphinx Date: Fri, 26 Jun 2015 21:49:48 +0500 Subject: [PATCH 2/6] New string if gear has no benefits --- common/locales/en/character.json | 3 ++- website/views/shared/profiles/stats.jade | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common/locales/en/character.json b/common/locales/en/character.json index 935392e455..533920330e 100644 --- a/common/locales/en/character.json +++ b/common/locales/en/character.json @@ -151,5 +151,6 @@ "str": "STR", "con": "CON", "per": "PER", - "int": "INT" + "int": "INT", + "noBenefit": "Confers no benefit" } diff --git a/website/views/shared/profiles/stats.jade b/website/views/shared/profiles/stats.jade index b2583c0e0b..66f1f593bf 100644 --- a/website/views/shared/profiles/stats.jade +++ b/website/views/shared/profiles/stats.jade @@ -29,6 +29,7 @@ unless mobile td strong {{piece.text()}}:  span(ng-repeat='stat in ["str","con","per","int"]', ng-show='piece[stat]') {{piece[stat]}} {{env.t(stat)}}  + span(ng-hide='piece.str || piece.con || piece.per || piece.int')=env.t('noBenefit') h4(class=mobile?'item item-divider':'')=env.t('attributes') table.table.table-striped From 44a120b57727734347c99c05935000970ea6c4d4 Mon Sep 17 00:00:00 2001 From: GihHubSphinx Date: Sun, 28 Jun 2015 09:18:39 +0500 Subject: [PATCH 3/6] Revert "New string if gear has no benefits" This reverts commit c2f0f89f2bfd9a00b772fa61b107eefbb914ddf5. --- common/locales/en/character.json | 3 +-- website/views/shared/profiles/stats.jade | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/common/locales/en/character.json b/common/locales/en/character.json index 533920330e..935392e455 100644 --- a/common/locales/en/character.json +++ b/common/locales/en/character.json @@ -151,6 +151,5 @@ "str": "STR", "con": "CON", "per": "PER", - "int": "INT", - "noBenefit": "Confers no benefit" + "int": "INT" } diff --git a/website/views/shared/profiles/stats.jade b/website/views/shared/profiles/stats.jade index 66f1f593bf..b2583c0e0b 100644 --- a/website/views/shared/profiles/stats.jade +++ b/website/views/shared/profiles/stats.jade @@ -29,7 +29,6 @@ unless mobile td strong {{piece.text()}}:  span(ng-repeat='stat in ["str","con","per","int"]', ng-show='piece[stat]') {{piece[stat]}} {{env.t(stat)}}  - span(ng-hide='piece.str || piece.con || piece.per || piece.int')=env.t('noBenefit') h4(class=mobile?'item item-divider':'')=env.t('attributes') table.table.table-striped From fdbd18a8ed1563c8c61fcb200e3e749324c08a91 Mon Sep 17 00:00:00 2001 From: GihHubSphinx Date: Sun, 28 Jun 2015 09:23:49 +0500 Subject: [PATCH 4/6] New string in stats if gear has no benefits (take 2) --- common/locales/en/character.json | 3 ++- website/views/shared/profiles/stats.jade | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common/locales/en/character.json b/common/locales/en/character.json index 935392e455..7f5d188610 100644 --- a/common/locales/en/character.json +++ b/common/locales/en/character.json @@ -151,5 +151,6 @@ "str": "STR", "con": "CON", "per": "PER", - "int": "INT" + "int": "INT", + "noBenefits": "No benefits" } diff --git a/website/views/shared/profiles/stats.jade b/website/views/shared/profiles/stats.jade index b2583c0e0b..aadfc24262 100644 --- a/website/views/shared/profiles/stats.jade +++ b/website/views/shared/profiles/stats.jade @@ -29,6 +29,7 @@ unless mobile td strong {{piece.text()}}:  span(ng-repeat='stat in ["str","con","per","int"]', ng-show='piece[stat]') {{piece[stat]}} {{env.t(stat)}}  + span(ng-hide='piece.str || piece.con || piece.per || piece.int')=env.t('noBenefits') h4(class=mobile?'item item-divider':'')=env.t('attributes') table.table.table-striped From aa0aec8d4b6171342980ee16b88630aa1311c513 Mon Sep 17 00:00:00 2001 From: GihHubSphinx Date: Thu, 16 Jul 2015 10:54:17 +0500 Subject: [PATCH 5/6] Revert "New string in stats if gear has no benefits (take 2)" This reverts commit fdbd18a8ed1563c8c61fcb200e3e749324c08a91. --- common/locales/en/character.json | 3 +-- website/views/shared/profiles/stats.jade | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/common/locales/en/character.json b/common/locales/en/character.json index 7f5d188610..935392e455 100644 --- a/common/locales/en/character.json +++ b/common/locales/en/character.json @@ -151,6 +151,5 @@ "str": "STR", "con": "CON", "per": "PER", - "int": "INT", - "noBenefits": "No benefits" + "int": "INT" } diff --git a/website/views/shared/profiles/stats.jade b/website/views/shared/profiles/stats.jade index aadfc24262..b2583c0e0b 100644 --- a/website/views/shared/profiles/stats.jade +++ b/website/views/shared/profiles/stats.jade @@ -29,7 +29,6 @@ unless mobile td strong {{piece.text()}}:  span(ng-repeat='stat in ["str","con","per","int"]', ng-show='piece[stat]') {{piece[stat]}} {{env.t(stat)}}  - span(ng-hide='piece.str || piece.con || piece.per || piece.int')=env.t('noBenefits') h4(class=mobile?'item item-divider':'')=env.t('attributes') table.table.table-striped From e48703602a590ef2678cf2324be9c36e1def2951 Mon Sep 17 00:00:00 2001 From: GihHubSphinx Date: Thu, 16 Jul 2015 12:00:56 +0500 Subject: [PATCH 6/6] Make colon is stats hideable --- website/views/shared/profiles/stats.jade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/views/shared/profiles/stats.jade b/website/views/shared/profiles/stats.jade index b2583c0e0b..383d9b9661 100644 --- a/website/views/shared/profiles/stats.jade +++ b/website/views/shared/profiles/stats.jade @@ -27,7 +27,8 @@ unless mobile table.table.table-striped(ng-show='user.flags.itemsEnabled') tr(ng-repeat='(k,v) in profile.items.gear.equipped', ng-init='piece=Content.gear.flat[v]', ng-show='piece') td - strong {{piece.text()}}:  + strong {{piece.text()}} + strong(ng-show='piece.str || piece.con || piece.per || piece.int') :  span(ng-repeat='stat in ["str","con","per","int"]', ng-show='piece[stat]') {{piece[stat]}} {{env.t(stat)}}  h4(class=mobile?'item item-divider':'')=env.t('attributes')