Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4268 from crookedneighbor/missing-env.ts

Browse Source 
Changed text to be translatable in inbox and character modal
This commit is contained in:
Matteo Pagliazzi
2014-11-24 20:20:41 +01:00
parent 19fb81aafd aafc1131ad
commit a6d7594dc1
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/controllers/groupsCtrl.js
+1 -1
View File
@@ -115,7 +115,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
}); });
$scope.sendPrivateMessage = function(uuid, message){ $scope.sendPrivateMessage = function(uuid, message){
$http.post('/api/v2/members/'+uuid+'/message',{message:message}).success(function(){ $http.post('/api/v2/members/'+uuid+'/message',{message:message}).success(function(){
Notification.text('Message sent.'); Notification.text(window.env.t('messageSentAlert'));
$rootScope.User.sync(); $rootScope.User.sync();
$scope.$close(); $scope.$close();
}); });
views/options/social/index.jade
+2 -2
View File
@@ -12,11 +12,11 @@ script(type='text/ng-template', id='partials/options.social.inbox.html')
.col-md-12 .col-md-12
+chatMessages('inbox') +chatMessages('inbox')
.form-inline .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 .checkbox
label label
input(type='checkbox', ng-model='user.inbox.optOut', ng-change='set({"inbox.optOut": user.inbox.optOut?true: false})') 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') script(type='text/ng-template', id='partials/options.social.tavern.html')
include ./tavern include ./tavern
views/shared/modals/members.jade
+6 -6
View File
@@ -4,9 +4,9 @@ script(type='text/ng-template', id='modals/member.html')
span {{::profile.profile.name}} span {{::profile.profile.name}}
span(ng-if='profile.contributor.level') - {{::contribText(profile.contributor, profile.backer)}} span(ng-if='profile.contributor.level') - {{::contribText(profile.contributor, profile.backer)}}
ul.pull-right.list-inline(ng-if='::user') 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-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='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=env.t('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-envelope(tooltip=env.t('sendPM'), ng-click="openModal('private-message',{controller:'MemberModalCtrl'})", tooltip-placement='bottom', style='cursor:pointer')
.modal-body .modal-body
.container-fluid .container-fluid
.row .row
@@ -37,9 +37,9 @@ script(type='text/ng-template', id='modals/member.html')
script(type='text/ng-template', id='modals/private-message.html') script(type='text/ng-template', id='modals/private-message.html')
.modal-header .modal-header
h4 Private message to {{profile.profile.name}} h4=env.t('pmHeading', {name: "{{profile.profile.name}}"})
.modal-body .modal-body
textarea.form-control(type='text',ng-model='_message') textarea.form-control(type='text',ng-model='_message')
.modal-footer .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') button.btn.btn-default(ng-click='$close()')=env.t('cancel')