From bf586cbc17fbed1e4bba86cc2ece988fa692bb32 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 23 Nov 2014 21:16:32 -0600 Subject: [PATCH 1/4] Added env.t declarations for translations --- views/options/social/index.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/options/social/index.jade b/views/options/social/index.jade index 5866743dd1..b0fb4053c8 100644 --- a/views/options/social/index.jade +++ b/views/options/social/index.jade @@ -12,11 +12,11 @@ script(type='text/ng-template', id='partials/options.social.inbox.html') .col-md-12 +chatMessages('inbox') .form-inline - a.btn.btn-xs.btn-danger(popover='Delete all messages', popover-trigger='mouseenter', ng-click='user.ops.clearPMs({})', popover-placement='right') Clear All + a.btn.btn-xs.btn-danger(popover=env.t('clearAllPopover'), popover-trigger='mouseenter', ng-click='user.ops.clearPMs({})', popover-placement='right')=env.t('clearAll') .checkbox label input(type='checkbox', ng-model='user.inbox.optOut', ng-change='set({"inbox.optOut": user.inbox.optOut?true: false})') - span.hint(popover-trigger='mouseenter', popover-placement='right', popover="Don't like private messages? Click to completely opt out") Opt Out + span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('optOutPopover'))=env.t('optOut') script(type='text/ng-template', id='partials/options.social.tavern.html') include ./tavern From d8c30fc8851bea7c1293af514bfdda24d82569a9 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 23 Nov 2014 21:19:40 -0600 Subject: [PATCH 2/4] Added env.t for member modal to allow for translations --- views/shared/modals/members.jade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/views/shared/modals/members.jade b/views/shared/modals/members.jade index 33c1052dc0..7ccdefa80f 100644 --- a/views/shared/modals/members.jade +++ b/views/shared/modals/members.jade @@ -4,9 +4,9 @@ script(type='text/ng-template', id='modals/member.html') span {{::profile.profile.name}} span(ng-if='profile.contributor.level') - {{::contribText(profile.contributor, profile.backer)}} ul.pull-right.list-inline(ng-if='::user') - li.glyphicon.glyphicon-plus(ng-show='user.inbox.blocks | contains:profile._id', tooltip='Un-block', ng-click="user.ops.blockUser({params:{uuid:profile._id}})", tooltip-placement='bottom', style='cursor:pointer') - li.glyphicon.glyphicon-ban-circle(ng-hide='user.inbox.blocks | contains:profile._id', tooltip='Block', ng-click="user.ops.blockUser({params:{uuid:profile._id}})", tooltip-placement='bottom', style='cursor:pointer') - li.glyphicon.glyphicon-envelope(tooltip='Send private message', ng-click="openModal('private-message',{controller:'MemberModalCtrl'})", tooltip-placement='bottom', style='cursor:pointer') + li.glyphicon.glyphicon-plus(ng-show='user.inbox.blocks | contains:profile._id', tooltip=env.t('unblock'), ng-click="user.ops.blockUser({params:{uuid:profile._id}})", tooltip-placement='bottom', style='cursor:pointer') + li.glyphicon.glyphicon-ban-circle(ng-hide='user.inbox.blocks | contains:profile._id', tooltip=env.t('block'), ng-click="user.ops.blockUser({params:{uuid:profile._id}})", tooltip-placement='bottom', style='cursor:pointer') + li.glyphicon.glyphicon-envelope(tooltip=env.t('sendPM'), ng-click="openModal('private-message',{controller:'MemberModalCtrl'})", tooltip-placement='bottom', style='cursor:pointer') .modal-body .container-fluid .row @@ -42,4 +42,4 @@ script(type='text/ng-template', id='modals/private-message.html') textarea.form-control(type='text',ng-model='_message') .modal-footer button.btn.btn-primary(ng-click='sendPrivateMessage(profile._id, _message)') Send - button.btn.btn-default(ng-click='$close()')=env.t('cancel') \ No newline at end of file + button.btn.btn-default(ng-click='$close()')=env.t('cancel') From 7ea8ff70ae96ed7c6f19d7630d115d91167cc0e1 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 23 Nov 2014 21:33:14 -0600 Subject: [PATCH 3/4] Added additional env.t declarations for pm modal --- views/shared/modals/members.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/shared/modals/members.jade b/views/shared/modals/members.jade index 7ccdefa80f..2bfb09d15c 100644 --- a/views/shared/modals/members.jade +++ b/views/shared/modals/members.jade @@ -37,9 +37,9 @@ script(type='text/ng-template', id='modals/member.html') script(type='text/ng-template', id='modals/private-message.html') .modal-header - h4 Private message to {{profile.profile.name}} + h4=env.t('pmHeading', {name: "{{profile.profile.name}}"}) .modal-body textarea.form-control(type='text',ng-model='_message') .modal-footer - button.btn.btn-primary(ng-click='sendPrivateMessage(profile._id, _message)') Send + button.btn.btn-primary(ng-click='sendPrivateMessage(profile._id, _message)')=env.t("send") button.btn.btn-default(ng-click='$close()')=env.t('cancel') From aafc1131ad31001c4b9ebee436ed4c50fee680a7 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 23 Nov 2014 21:39:14 -0600 Subject: [PATCH 4/4] Made message sent notification a translatable string --- public/js/controllers/groupsCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/controllers/groupsCtrl.js b/public/js/controllers/groupsCtrl.js index f77f08b017..f5c0e9e846 100644 --- a/public/js/controllers/groupsCtrl.js +++ b/public/js/controllers/groupsCtrl.js @@ -115,7 +115,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', ' }); $scope.sendPrivateMessage = function(uuid, message){ $http.post('/api/v2/members/'+uuid+'/message',{message:message}).success(function(){ - Notification.text('Message sent.'); + Notification.text(window.env.t('messageSentAlert')); $rootScope.User.sync(); $scope.$close(); });