From 0ce0823de44b933090bd7e4f85fc107af5fb9827 Mon Sep 17 00:00:00 2001 From: Adrien Lemaire Date: Fri, 15 Nov 2013 00:19:36 +1100 Subject: [PATCH 1/6] update ui to test hidable gears --- views/options/profile.jade | 9 +++++++++ views/shared/header/avatar.jade | 7 ++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/views/options/profile.jade b/views/options/profile.jade index 27c5baa885..18575f46b7 100644 --- a/views/options/profile.jade +++ b/views/options/profile.jade @@ -11,6 +11,15 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template') label.checkbox input(type='checkbox', ng-model='user.preferences.showHelm', ng-change='toggleHelm(user.preferences.showHelm)') | Show Helm + label.checkbox + input(type='checkbox', ng-model='user.preferences.showWeapon', ng-change='toggleHelm(user.preferences.showWeapon)') + | Show Weapon + label.checkbox + input(type='checkbox', ng-model='user.preferences.showShield', ng-change='toggleHelm(user.preferences.showShield)') + | Show Shield + label.checkbox + input(type='checkbox', ng-model='user.preferences.showArmor', ng-change='toggleHelm(user.preferences.showArmor)') + | Show Armor menu(ng-show='user.preferences.gender=="f"', type='list') li.customize-menu diff --git a/views/shared/header/avatar.jade b/views/shared/header/avatar.jade index 3154f5f92d..4ea0f2b05c 100644 --- a/views/shared/header/avatar.jade +++ b/views/shared/header/avatar.jade @@ -11,11 +11,12 @@ figure.herobox(ng-click='clickMember(profile._id)', data-name='{{profile.profile // Avatar span(class='{{profile.preferences.gender}}_skin_{{profile.preferences.skin}}') span(class='{{profile.preferences.gender}}_hair_{{profile.preferences.hair}}') - span(class='{{equipped("armor", profile.items.armor, profile.preferences, profile.backer, profile.contributor)}}') + span(class='{{equipped("armor", 0, profile.preferences, profile.backer, profile.contributor)}}') + span(class='{{equipped("armor", profile.items.armor, profile.preferences, profile.backer, profile.contributor)}}', ng-show='profile.preferences.showArmor') span(class='{{profile.preferences.gender}}_head_0', ng-hide='profile.preferences.showHelm') span(class='{{equipped("head", profile.items.head, profile.preferences, profile.backer, profile.contributor)}}', ng-show='profile.preferences.showHelm') - span(class='{{equipped("shield",profile.items.shield,profile.preferences, profile.backer, profile.contributor)}}') - span(class='{{equipped("weapon",profile.items.weapon,profile.preferences, profile.backer, profile.contributor)}}') + span(class='{{equipped("shield",profile.items.shield,profile.preferences, profile.backer, profile.contributor)}}', ng-show='profile.preferences.showShield') + span(class='{{equipped("weapon",profile.items.weapon,profile.preferences, profile.backer, profile.contributor)}}', ng-show='profile.preferences.showWeapon') // Mount Head span(ng-if='profile.items.currentMount', class='Mount_Head_{{profile.items.currentMount}}') From 80be38062e66fccb9526bd37efcf74746a03dba9 Mon Sep 17 00:00:00 2001 From: Adrien Lemaire Date: Fri, 15 Nov 2013 00:26:25 +1100 Subject: [PATCH 2/6] add migration file for default preferences --- migrations/20131115_update_gear_preferences.js | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 migrations/20131115_update_gear_preferences.js diff --git a/migrations/20131115_update_gear_preferences.js b/migrations/20131115_update_gear_preferences.js new file mode 100644 index 0000000000..9ec1264b2f --- /dev/null +++ b/migrations/20131115_update_gear_preferences.js @@ -0,0 +1,10 @@ +//Add defaults to show gears in all users +db.users.update( + {}, + {$set:{ + 'preferences.showWeapon': true, + 'preferences.showShield': true, + 'preferences.showArmor': true, + }}, + {multi:true} +) From 7c15f09e03595d2e38c19deecc628983fd4264e8 Mon Sep 17 00:00:00 2001 From: Adrien Lemaire Date: Fri, 15 Nov 2013 00:51:54 +1100 Subject: [PATCH 3/6] code logic to update preferences --- public/js/controllers/userCtrl.js | 3 --- src/models/user.js | 3 +++ views/options/profile.jade | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/public/js/controllers/userCtrl.js b/public/js/controllers/userCtrl.js index 793f54c9f7..70a950c9cd 100644 --- a/public/js/controllers/userCtrl.js +++ b/public/js/controllers/userCtrl.js @@ -6,9 +6,6 @@ habitrpg.controller("UserCtrl", ['$rootScope', '$scope', '$location', 'User', '$ $scope.hideUserAvatar = function() { $(".userAvatar").hide(); }; - $scope.toggleHelm = function(val){ - User.log({op:'set', data:{'preferences.showHelm':val}}); - } $scope.$watch('_editing.profile', function(value){ if(value === true) $scope.editingProfile = angular.copy(User.user.profile); diff --git a/src/models/user.js b/src/models/user.js index f1ac9ea5e5..402dddf34f 100644 --- a/src/models/user.js +++ b/src/models/user.js @@ -191,6 +191,9 @@ var UserSchema = new Schema({ hair: {type:String, 'default':'blond'}, hideHeader: {type:Boolean, 'default':false}, showHelm: {type:Boolean, 'default':true}, + showWeapon: {type:Boolean, 'default':true}, + showShield: {type:Boolean, 'default':true}, + showArmor: {type:Boolean, 'default':true}, skin: {type:String, 'default':'white'}, timezoneOffset: Number, language: String diff --git a/views/options/profile.jade b/views/options/profile.jade index 18575f46b7..2ec556a09b 100644 --- a/views/options/profile.jade +++ b/views/options/profile.jade @@ -9,16 +9,16 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template') button.m_head_0.customize-option(type='button', ng-click='set("preferences.gender","m")') button.f_head_0.customize-option(type='button', ng-click='set("preferences.gender","f")') label.checkbox - input(type='checkbox', ng-model='user.preferences.showHelm', ng-change='toggleHelm(user.preferences.showHelm)') + input(type='checkbox', ng-model='user.preferences.showHelm', ng-change='set("preferences.showHelm", user.preferences.showHelm?true: false)') | Show Helm label.checkbox - input(type='checkbox', ng-model='user.preferences.showWeapon', ng-change='toggleHelm(user.preferences.showWeapon)') + input(type='checkbox', ng-model='user.preferences.showWeapon', ng-change='set("preferences.showWeapon", user.preferences.showWeapon?true: false)') | Show Weapon label.checkbox - input(type='checkbox', ng-model='user.preferences.showShield', ng-change='toggleHelm(user.preferences.showShield)') + input(type='checkbox', ng-model='user.preferences.showShield', ng-change='set("preferences.showShield", user.preferences.showShield?true: false)') | Show Shield label.checkbox - input(type='checkbox', ng-model='user.preferences.showArmor', ng-change='toggleHelm(user.preferences.showArmor)') + input(type='checkbox', ng-model='user.preferences.showArmor', ng-change='set("preferences.showArmor", user.preferences.showArmor?true: false)') | Show Armor menu(ng-show='user.preferences.gender=="f"', type='list') From 05814237ed9c56c9ee8e131982be94b4a6c80d4d Mon Sep 17 00:00:00 2001 From: Adrien Lemaire Date: Fri, 15 Nov 2013 00:56:57 +1100 Subject: [PATCH 4/6] update translations with new Show gear strings --- locales/bg/app.json | 3 +++ locales/cs/app.json | 3 +++ locales/cu/app.json | 3 +++ locales/de/app.json | 3 +++ locales/en/app.json | 3 +++ locales/es/app.json | 3 +++ locales/fr/app.json | 5 ++++- locales/he/app.json | 3 +++ locales/id/app.json | 3 +++ locales/it/app.json | 3 +++ locales/ja/app.json | 3 +++ locales/nl/app.json | 3 +++ locales/no/app.json | 3 +++ locales/pl/app.json | 3 +++ locales/pt/app.json | 3 +++ locales/ru/app.json | 3 +++ locales/uk/app.json | 3 +++ locales/ur/app.json | 3 +++ 18 files changed, 55 insertions(+), 1 deletion(-) diff --git a/locales/bg/app.json b/locales/bg/app.json index d4a0b0aafb..beab2057da 100644 --- a/locales/bg/app.json +++ b/locales/bg/app.json @@ -127,6 +127,9 @@ "head": "Head", "showHelm": "Show Helm", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", + "showArmor": "Show Armor", "hair": "Hair", "skin": "Skin", "clothing" : "Clothing", diff --git a/locales/cs/app.json b/locales/cs/app.json index b29382a176..ddc3a90984 100644 --- a/locales/cs/app.json +++ b/locales/cs/app.json @@ -128,6 +128,9 @@ "head": "Head", "showHelm": "Show Helm", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", + "showArmor": "Show Armor", "hair": "Hair", "skin": "Skin", "clothing" : "Clothing", diff --git a/locales/cu/app.json b/locales/cu/app.json index 37b003b75c..63755bf87d 100644 --- a/locales/cu/app.json +++ b/locales/cu/app.json @@ -129,6 +129,9 @@ "head": "Head", "showHelm": "Show Helm", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", + "showArmor": "Show Armor", "hair": "Hair", "skin": "Skin", "clothing" : "Clothing", diff --git a/locales/de/app.json b/locales/de/app.json index 90d862c503..612f870a41 100644 --- a/locales/de/app.json +++ b/locales/de/app.json @@ -128,6 +128,9 @@ "head": "Kopf", "showHelm": "Helm sichtbar", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", + "showArmor": "Show Armor", "hair": "Haare", "skin": "Haut", "clothing" : "Kleidung", diff --git a/locales/en/app.json b/locales/en/app.json index f068b817c5..999620548f 100644 --- a/locales/en/app.json +++ b/locales/en/app.json @@ -134,6 +134,9 @@ "head": "Head", "showHelm": "Show Helm", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", + "showArmor": "Show Armor", "hair": "Hair", "skin": "Skin", "clothing" : "Clothing", diff --git a/locales/es/app.json b/locales/es/app.json index fdddf5d73b..499966802a 100644 --- a/locales/es/app.json +++ b/locales/es/app.json @@ -128,6 +128,9 @@ "head": "Cabeza", "showHelm": "Mostrar Yelmo", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", + "showArmor": "Show Armor", "hair": "Cabello", "skin": "Piel", "clothing" : "Ropa", diff --git a/locales/fr/app.json b/locales/fr/app.json index ce61a15538..e93e9e5bfc 100644 --- a/locales/fr/app.json +++ b/locales/fr/app.json @@ -128,7 +128,10 @@ "avatar": "Avatar", "head": "Tête", - "showHelm": "Afficher le casque", + "showHelm": "Montrer le casque", + "showWeapon": "Montrer l'arme", + "showShield": "Montrer le bouclier", + "showArmor": "Montrer l'armure", "hair": "Cheveux", "skin": "Peau", "clothing" : "Vêtements", diff --git a/locales/he/app.json b/locales/he/app.json index b2f0ec81de..4aae3d0ad3 100644 --- a/locales/he/app.json +++ b/locales/he/app.json @@ -133,6 +133,9 @@ "head": "ראש", "showHelm": "הראה קסדה", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", + "showArmor": "Show Armor", "hair": "שיער", "skin": "עור", "clothing" : "לבוש", diff --git a/locales/id/app.json b/locales/id/app.json index 6e96308bb3..6c09b8f08a 100644 --- a/locales/id/app.json +++ b/locales/id/app.json @@ -129,6 +129,9 @@ "head": "Head", "showHelm": "Show Helm", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", + "showArmor": "Show Armor", "hair": "Hair", "skin": "Skin", "clothing" : "Clothing", diff --git a/locales/it/app.json b/locales/it/app.json index d7b97197a0..ad2872059a 100644 --- a/locales/it/app.json +++ b/locales/it/app.json @@ -129,6 +129,9 @@ "head": "Testa", "showHelm": "Mostra Elmo", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", + "showArmor": "Show Armor", "hair": "Capelli", "skin": "Pelle", "clothing" : "Abbigliamento", diff --git a/locales/ja/app.json b/locales/ja/app.json index 3f6b197354..bf664a16be 100644 --- a/locales/ja/app.json +++ b/locales/ja/app.json @@ -129,6 +129,9 @@ "head": "頭", "showHelm": "Show 兜", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", + "showArmor": "Show Armor", "hair": "Hair", "skin": "皮膚", "clothing" : "衣料", diff --git a/locales/nl/app.json b/locales/nl/app.json index 812296ef2a..bf5ee77898 100644 --- a/locales/nl/app.json +++ b/locales/nl/app.json @@ -129,6 +129,9 @@ "head": "Hoofd", "showHelm": "Toon Helm", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", + "showArmor": "Show Armor", "hair": "Haar", "skin": "Huid", "clothing" : "Kleding", diff --git a/locales/no/app.json b/locales/no/app.json index 8e837fec62..d0e055a57c 100644 --- a/locales/no/app.json +++ b/locales/no/app.json @@ -134,6 +134,9 @@ "head": "Hode", "hair": "Hår", "showHelm": "Vis hjelm", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", + "showArmor": "Show Armor", "skin": "Hudfarge", "clothing" : "Klær", "photoUrl": "Bilde-URL", diff --git a/locales/pl/app.json b/locales/pl/app.json index a24f2b8c5e..87f5762625 100644 --- a/locales/pl/app.json +++ b/locales/pl/app.json @@ -129,6 +129,9 @@ "head": "Głowa", "showHelm": "Pokazuj hełm", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", + "showArmor": "Show Armor", "hair": "Włosy", "skin": "Karnacja", "clothing" : "Ubranie", diff --git a/locales/pt/app.json b/locales/pt/app.json index 1e81ab6a67..162daca9b5 100644 --- a/locales/pt/app.json +++ b/locales/pt/app.json @@ -129,6 +129,9 @@ "head": "Cabeça", "showHelm": "Mostrar Elmo", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", + "showArmor": "Show Armor", "hair": "Cabelo", "skin": "Pele", "clothing" : "Vestimentas", diff --git a/locales/ru/app.json b/locales/ru/app.json index 7d46037ed6..33993c8fcd 100644 --- a/locales/ru/app.json +++ b/locales/ru/app.json @@ -129,6 +129,9 @@ "head": "Голова", "showHelm": "Показывать шлем", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", + "showArmor": "Show Armor", "hair": "Волосы", "skin": "Кожа", "clothing" : "Одежда", diff --git a/locales/uk/app.json b/locales/uk/app.json index ac63261901..019303f8b7 100644 --- a/locales/uk/app.json +++ b/locales/uk/app.json @@ -129,6 +129,9 @@ "head": "Голова", "showHelm": "Показывать шолом", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", + "showArmor": "Show Armor", "hair": "Волосся", "skin": "Кожа", "clothing" : "Одяг", diff --git a/locales/ur/app.json b/locales/ur/app.json index d108b425bc..8056827c2a 100644 --- a/locales/ur/app.json +++ b/locales/ur/app.json @@ -128,6 +128,9 @@ "head": "سر", "showHelm": "Show Helm", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", + "showArmor": "Show Armor", "hair": "بال", "skin": "Skin", "clothing" : "Clothing", From e240a4404f81d0f4525666617611c9bcd4ad2312 Mon Sep 17 00:00:00 2001 From: Adrien Lemaire Date: Tue, 19 Nov 2013 10:34:54 +1100 Subject: [PATCH 5/6] reorganize menus --- views/options/profile.jade | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/views/options/profile.jade b/views/options/profile.jade index 2ec556a09b..b3ae3da80e 100644 --- a/views/options/profile.jade +++ b/views/options/profile.jade @@ -11,21 +11,24 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template') label.checkbox input(type='checkbox', ng-model='user.preferences.showHelm', ng-change='set("preferences.showHelm", user.preferences.showHelm?true: false)') | Show Helm + menu(type='list') + li.customize-menu + menu(label='Clothing') + button.f_armor_0_v1.customize-option(ng-show='user.preferences.gender=="f"', type='button', ng-click='set("preferences.armorSet","v1")') + button.f_armor_0_v2.customize-option(ng-show='user.preferences.gender=="f"', type='button', ng-click='set("preferences.armorSet","v2")') + label.checkbox + input(type='checkbox', ng-model='user.preferences.showArmor', ng-change='set("preferences.showArmor", user.preferences.showArmor?true: false)') + | Show Armor + menu(type='list') + li.customize-menu + menu(label='Other') label.checkbox input(type='checkbox', ng-model='user.preferences.showWeapon', ng-change='set("preferences.showWeapon", user.preferences.showWeapon?true: false)') | Show Weapon label.checkbox input(type='checkbox', ng-model='user.preferences.showShield', ng-change='set("preferences.showShield", user.preferences.showShield?true: false)') | Show Shield - label.checkbox - input(type='checkbox', ng-model='user.preferences.showArmor', ng-change='set("preferences.showArmor", user.preferences.showArmor?true: false)') - | Show Armor - menu(ng-show='user.preferences.gender=="f"', type='list') - li.customize-menu - menu(label='Clothing') - button.f_armor_0_v1.customize-option(type='button', ng-click='set("preferences.armorSet","v1")') - button.f_armor_0_v2.customize-option(type='button', ng-click='set("preferences.armorSet","v2")') .span4 // hair From 0a0504d8002116395d71f4f5b79cf0c4da1dcc63 Mon Sep 17 00:00:00 2001 From: Adrien Lemaire Date: Tue, 19 Nov 2013 10:35:02 +1100 Subject: [PATCH 6/6] update translations files --- locales/bg/app.json | 7 ++++--- locales/cs/app.json | 7 ++++--- locales/cu/app.json | 7 ++++--- locales/de/app.json | 7 ++++--- locales/el/app.json | 4 ++++ locales/en/app.json | 7 ++++--- locales/es/app.json | 7 ++++--- locales/fr/app.json | 7 ++++--- locales/he/app.json | 7 ++++--- locales/id/app.json | 7 ++++--- locales/it/app.json | 7 ++++--- locales/ja/app.json | 7 ++++--- locales/nl/app.json | 7 ++++--- locales/no/app.json | 7 ++++--- locales/pl/app.json | 7 ++++--- locales/pt/app.json | 7 ++++--- locales/ru/app.json | 7 ++++--- locales/sl/app.json | 8 ++++++-- locales/uk/app.json | 7 ++++--- locales/ur/app.json | 7 ++++--- 20 files changed, 82 insertions(+), 56 deletions(-) diff --git a/locales/bg/app.json b/locales/bg/app.json index beab2057da..f8805bbf7a 100644 --- a/locales/bg/app.json +++ b/locales/bg/app.json @@ -127,12 +127,13 @@ "head": "Head", "showHelm": "Show Helm", - "showWeapon": "Show Weapon", - "showShield": "Show Shield", - "showArmor": "Show Armor", "hair": "Hair", "skin": "Skin", "clothing" : "Clothing", + "showArmor": "Show Armor", + "other": "Other", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", "photoUrl": "Photo Url", "fullName": "Full Name", "blurb": "Blurb", diff --git a/locales/cs/app.json b/locales/cs/app.json index ddc3a90984..d3c776157a 100644 --- a/locales/cs/app.json +++ b/locales/cs/app.json @@ -128,12 +128,13 @@ "head": "Head", "showHelm": "Show Helm", - "showWeapon": "Show Weapon", - "showShield": "Show Shield", - "showArmor": "Show Armor", "hair": "Hair", "skin": "Skin", "clothing" : "Clothing", + "showArmor": "Show Armor", + "other": "Other", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", "photoUrl": "Photo Url", "fullName": "Full Name", "blurb": "Blurb", diff --git a/locales/cu/app.json b/locales/cu/app.json index 63755bf87d..d69a2a23d0 100644 --- a/locales/cu/app.json +++ b/locales/cu/app.json @@ -129,12 +129,13 @@ "head": "Head", "showHelm": "Show Helm", - "showWeapon": "Show Weapon", - "showShield": "Show Shield", - "showArmor": "Show Armor", "hair": "Hair", "skin": "Skin", "clothing" : "Clothing", + "showArmor": "Show Armor", + "other": "Other", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", "photoUrl": "Photo Url", "fullName": "Full Name", "blurb": "Blurb", diff --git a/locales/de/app.json b/locales/de/app.json index 612f870a41..26a139867e 100644 --- a/locales/de/app.json +++ b/locales/de/app.json @@ -128,12 +128,13 @@ "head": "Kopf", "showHelm": "Helm sichtbar", - "showWeapon": "Show Weapon", - "showShield": "Show Shield", - "showArmor": "Show Armor", "hair": "Haare", "skin": "Haut", "clothing" : "Kleidung", + "showArmor": "Show Armor", + "other": "Other", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", "photoUrl": "Bild-Url", "fullName": "Name", "blurb": "über dich", diff --git a/locales/el/app.json b/locales/el/app.json index f89ce2a0bc..349009af8c 100644 --- a/locales/el/app.json +++ b/locales/el/app.json @@ -135,6 +135,10 @@ "hair": "Μαλλιά", "skin": "Δέρμα", "clothing" : "Ρούχα", + "showArmor": "Show Armor", + "other": "Other", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", "photoUrl": "Url Φωτογραφίας", "fullName": "Πλήρες Όνομα", "blurb": "Κείμενο", diff --git a/locales/en/app.json b/locales/en/app.json index 999620548f..607e721ff9 100644 --- a/locales/en/app.json +++ b/locales/en/app.json @@ -134,12 +134,13 @@ "head": "Head", "showHelm": "Show Helm", - "showWeapon": "Show Weapon", - "showShield": "Show Shield", - "showArmor": "Show Armor", "hair": "Hair", "skin": "Skin", "clothing" : "Clothing", + "showWeapon": "Show Weapon", + "other" : "Other", + "showShield": "Show Shield", + "showArmor": "Show Armor", "photoUrl": "Photo Url", "fullName": "Full Name", "blurb": "Blurb", diff --git a/locales/es/app.json b/locales/es/app.json index 499966802a..a4abe78bf4 100644 --- a/locales/es/app.json +++ b/locales/es/app.json @@ -128,12 +128,13 @@ "head": "Cabeza", "showHelm": "Mostrar Yelmo", - "showWeapon": "Show Weapon", - "showShield": "Show Shield", - "showArmor": "Show Armor", "hair": "Cabello", "skin": "Piel", "clothing" : "Ropa", + "showArmor": "Show Armor", + "other": "Other", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", "photoUrl": "Url de la Imagen", "fullName": "Nombre Completo", "blurb": "Descripción", diff --git a/locales/fr/app.json b/locales/fr/app.json index e93e9e5bfc..80e646e8e6 100644 --- a/locales/fr/app.json +++ b/locales/fr/app.json @@ -129,12 +129,13 @@ "head": "Tête", "showHelm": "Montrer le casque", - "showWeapon": "Montrer l'arme", - "showShield": "Montrer le bouclier", - "showArmor": "Montrer l'armure", "hair": "Cheveux", "skin": "Peau", "clothing" : "Vêtements", + "showArmor": "Montrer l'armure", + "other": "Autres", + "showWeapon": "Montrer l'arme", + "showShield": "Montrer le bouclier", "photoUrl": "Lien vers la photo", "fullName": "Nom complet", "blurb": "Bio", diff --git a/locales/he/app.json b/locales/he/app.json index 4aae3d0ad3..6a5aa7e8b4 100644 --- a/locales/he/app.json +++ b/locales/he/app.json @@ -133,12 +133,13 @@ "head": "ראש", "showHelm": "הראה קסדה", - "showWeapon": "Show Weapon", - "showShield": "Show Shield", - "showArmor": "Show Armor", "hair": "שיער", "skin": "עור", "clothing" : "לבוש", + "showArmor": "Show Armor", + "other": "Other", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", "photoUrl": "כתובת תמונה", "fullName": "שם מלא", "blurb": "קצת על עצמך", diff --git a/locales/id/app.json b/locales/id/app.json index 6c09b8f08a..8e58a655a6 100644 --- a/locales/id/app.json +++ b/locales/id/app.json @@ -129,12 +129,13 @@ "head": "Head", "showHelm": "Show Helm", - "showWeapon": "Show Weapon", - "showShield": "Show Shield", - "showArmor": "Show Armor", "hair": "Hair", "skin": "Skin", "clothing" : "Clothing", + "showArmor": "Show Armor", + "other": "Other", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", "photoUrl": "Photo Url", "fullName": "Full Name", "blurb": "Blurb", diff --git a/locales/it/app.json b/locales/it/app.json index ad2872059a..45dfec882f 100644 --- a/locales/it/app.json +++ b/locales/it/app.json @@ -129,12 +129,13 @@ "head": "Testa", "showHelm": "Mostra Elmo", - "showWeapon": "Show Weapon", - "showShield": "Show Shield", - "showArmor": "Show Armor", "hair": "Capelli", "skin": "Pelle", "clothing" : "Abbigliamento", + "showArmor": "Show Armor", + "other": "Other", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", "photoUrl": "Url Foto", "fullName": "Nome Completo", "blurb": "Firma", diff --git a/locales/ja/app.json b/locales/ja/app.json index bf664a16be..879daa5c31 100644 --- a/locales/ja/app.json +++ b/locales/ja/app.json @@ -129,12 +129,13 @@ "head": "頭", "showHelm": "Show 兜", - "showWeapon": "Show Weapon", - "showShield": "Show Shield", - "showArmor": "Show Armor", "hair": "Hair", "skin": "皮膚", "clothing" : "衣料", + "showArmor": "Show Armor", + "other": "Other", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", "photoUrl": "写真 URL", "fullName": "名前", "blurb": "自己紹介", diff --git a/locales/nl/app.json b/locales/nl/app.json index bf5ee77898..90093b7574 100644 --- a/locales/nl/app.json +++ b/locales/nl/app.json @@ -129,12 +129,13 @@ "head": "Hoofd", "showHelm": "Toon Helm", - "showWeapon": "Show Weapon", - "showShield": "Show Shield", - "showArmor": "Show Armor", "hair": "Haar", "skin": "Huid", "clothing" : "Kleding", + "showArmor": "Show Armor", + "other": "Other", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", "photoUrl": "Foto URL", "fullName": "Volledige Naam", "blurb": "Blurp", diff --git a/locales/no/app.json b/locales/no/app.json index d0e055a57c..b668b942bb 100644 --- a/locales/no/app.json +++ b/locales/no/app.json @@ -134,12 +134,13 @@ "head": "Hode", "hair": "Hår", "showHelm": "Vis hjelm", - "showWeapon": "Show Weapon", - "showShield": "Show Shield", - "showArmor": "Show Armor", "skin": "Hudfarge", "clothing" : "Klær", "photoUrl": "Bilde-URL", + "showArmor": "Show Armor", + "other": "Other", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", "fullName": "Fullt navn", "blurb": "Kort om deg", "websites": "Nettsider", diff --git a/locales/pl/app.json b/locales/pl/app.json index 87f5762625..ee97d430b3 100644 --- a/locales/pl/app.json +++ b/locales/pl/app.json @@ -129,12 +129,13 @@ "head": "Głowa", "showHelm": "Pokazuj hełm", - "showWeapon": "Show Weapon", - "showShield": "Show Shield", - "showArmor": "Show Armor", "hair": "Włosy", "skin": "Karnacja", "clothing" : "Ubranie", + "showArmor": "Show Armor", + "other": "Other", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", "photoUrl": "URL obrazka", "fullName": "Imię i nazwisko", "blurb": "Krótki opis", diff --git a/locales/pt/app.json b/locales/pt/app.json index 162daca9b5..669488790c 100644 --- a/locales/pt/app.json +++ b/locales/pt/app.json @@ -129,12 +129,13 @@ "head": "Cabeça", "showHelm": "Mostrar Elmo", - "showWeapon": "Show Weapon", - "showShield": "Show Shield", - "showArmor": "Show Armor", "hair": "Cabelo", "skin": "Pele", "clothing" : "Vestimentas", + "showArmor": "Show Armor", + "other": "Other", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", "photoUrl": "Url da Foto", "fullName": "Nome Completo", "blurb": "Sinopse", diff --git a/locales/ru/app.json b/locales/ru/app.json index 33993c8fcd..1e13f69762 100644 --- a/locales/ru/app.json +++ b/locales/ru/app.json @@ -129,12 +129,13 @@ "head": "Голова", "showHelm": "Показывать шлем", - "showWeapon": "Show Weapon", - "showShield": "Show Shield", - "showArmor": "Show Armor", "hair": "Волосы", "skin": "Кожа", "clothing" : "Одежда", + "showArmor": "Show Armor", + "other": "Other", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", "photoUrl": "Ссылка на фото", "fullName": "Полное имя", "blurb": "О себе", diff --git a/locales/sl/app.json b/locales/sl/app.json index 34e1db8429..ef5783c5e9 100644 --- a/locales/sl/app.json +++ b/locales/sl/app.json @@ -136,7 +136,11 @@ "showHelm": "Pokaži čelado", "hair": "Lasje", "skin": "Polt", - "clothing" : "Oblačila", + "clothing" : "OblaËila", + "showArmor": "Show Armor", + "other": "Other", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", "photoUrl": "Spletni naslov slike", "fullName": "Polno ime", "blurb": "O tebi", @@ -410,4 +414,4 @@ "yesterday":"Včeraj", "daysAgo":"dni nazaj" -} \ No newline at end of file +} diff --git a/locales/uk/app.json b/locales/uk/app.json index 019303f8b7..2dbe2ecedc 100644 --- a/locales/uk/app.json +++ b/locales/uk/app.json @@ -129,12 +129,13 @@ "head": "Голова", "showHelm": "Показывать шолом", - "showWeapon": "Show Weapon", - "showShield": "Show Shield", - "showArmor": "Show Armor", "hair": "Волосся", "skin": "Кожа", "clothing" : "Одяг", + "showArmor": "Show Armor", + "other": "Other", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", "photoUrl": "Посилання на фото", "fullName": "Повне ім'я", "blurb": "Про себе", diff --git a/locales/ur/app.json b/locales/ur/app.json index 8056827c2a..25129f1f72 100644 --- a/locales/ur/app.json +++ b/locales/ur/app.json @@ -128,12 +128,13 @@ "head": "سر", "showHelm": "Show Helm", - "showWeapon": "Show Weapon", - "showShield": "Show Shield", - "showArmor": "Show Armor", "hair": "بال", "skin": "Skin", "clothing" : "Clothing", + "showArmor": "Show Armor", + "other": "Other", + "showWeapon": "Show Weapon", + "showShield": "Show Shield", "photoUrl": "Photo Url", "fullName": "Full Name", "blurb": "Blurb",