From 314497271a74e98c323c73c75fdba8109f0bca5a Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Wed, 2 Apr 2014 15:32:26 +0200 Subject: [PATCH] fix(i18n): group name --- public/js/controllers/groupsCtrl.js | 4 ++-- views/options/social/create-group.jade | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/public/js/controllers/groupsCtrl.js b/public/js/controllers/groupsCtrl.js index c0ba02c5a1..898f0a0d8f 100644 --- a/public/js/controllers/groupsCtrl.js +++ b/public/js/controllers/groupsCtrl.js @@ -213,7 +213,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', ' "public": Groups.publicGuilds() } $scope.type = 'guild'; - $scope.text = 'Guild'; + $scope.text = window.env.t('guild'); var newGroup = function(){ return new Groups.Group({type:'guild', privacy:'private'}); } @@ -316,7 +316,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', ' .controller("PartyCtrl", ['$rootScope','$scope', 'Groups', 'User', 'Challenges', '$state', '$compile', function($rootScope,$scope, Groups, User, Challenges, $state, $compile) { $scope.type = 'party'; - $scope.text = 'Party'; + $scope.text = window.env.t('party'); $scope.group = $rootScope.party = Groups.party(); $scope.newGroup = new Groups.Group({type:'party'}); diff --git a/views/options/social/create-group.jade b/views/options/social/create-group.jade index bd2563cd76..7fd8059596 100644 --- a/views/options/social/create-group.jade +++ b/views/options/social/create-group.jade @@ -3,9 +3,8 @@ form.col-md-12.form-horizontal(ng-submit='create(newGroup)') .form-group label.control-label(for='new-group-name') - | {{text}}  - =env.t('name') - input.form-control#new-group-name.input-medium.option-content(required, type='text', placeholder=('{{text}} ' + env.t('name')), ng-model='newGroup.name') + env.t('newGroupName', {groupType: "{{text}}"}) + input.form-control#new-group-name.input-medium.option-content(required, type='text', placeholder=env.t('newGroupName', {groupType: "{{text}}"}), ng-model='newGroup.name') .form-group label(for='new-group-description')=env.t('description') textarea.form-control#new-group-description.option-content(cols='3', placeholder=env.t('description'), ng-model='newGroup.description')