From 2440b312a27b798fa3cef97b35aea59e80f039c1 Mon Sep 17 00:00:00 2001 From: GihHubSphinx Date: Thu, 21 May 2015 17:12:16 +0500 Subject: [PATCH 1/2] Made two lines translatable Addressing #10 and #11 in the OP of https://github.com/HabitRPG/habitrpg/issues/4522 * "Send gift" (in the form that pops up when you click on username label) * "Invite Friends" button (in "Members" section in guilds and party) --- common/locales/en/groups.json | 4 +++- website/views/options/social/group.jade | 2 +- website/views/shared/modals/members.jade | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/locales/en/groups.json b/common/locales/en/groups.json index 3b7e0b8c74..6ec6ef0bfb 100644 --- a/common/locales/en/groups.json +++ b/common/locales/en/groups.json @@ -101,5 +101,7 @@ "messageAddedAsToDo": "Message copied as To-Do.", "messageWroteIn": "<%= user %> wrote in <%= group %>", "msgPreviewHeading": "Message Preview", - "leaderOnlyChallenges": "Only group leader can create challenges" + "leaderOnlyChallenges": "Only group leader can create challenges", + "sendGift": "Send Gift", + "inviteFriends": "Invite Friends" } diff --git a/website/views/options/social/group.jade b/website/views/options/social/group.jade index add08b2ddc..850694e7e4 100644 --- a/website/views/options/social/group.jade +++ b/website/views/options/social/group.jade @@ -60,7 +60,7 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter .panel-heading h3.panel-title =env.t('members') - button.pull-right.btn.btn-primary(ng-click="openInviteModal(group)") Invite Friends + button.pull-right.btn.btn-primary(ng-click="openInviteModal(group)")=env.t('inviteFriends') .panel-body.modal-fixed-height div.form-group(ng-if='::group.type=="party"') p=env.t('partyList') diff --git a/website/views/shared/modals/members.jade b/website/views/shared/modals/members.jade index 28b8f7952b..2f5fc4196e 100644 --- a/website/views/shared/modals/members.jade +++ b/website/views/shared/modals/members.jade @@ -39,7 +39,7 @@ script(type='text/ng-template', id='modals/member.html') span.glyphicon.glyphicon-ban-circle button.btn.btn-md.btn-default(tooltip=env.t('sendPM'), ng-click="openModal('private-message',{controller:'MemberModalCtrl'})", tooltip-placement='right') span.glyphicon.glyphicon-envelope - button.btn.btn-md.btn-default(tooltip="Send Gift", ng-click="openModal('send-gift',{controller:'MemberModalCtrl'})", tooltip-placement='right') + button.btn.btn-md.btn-default(tooltip=env.t('sendGift'), ng-click="openModal('send-gift',{controller:'MemberModalCtrl'})", tooltip-placement='right') span.glyphicon.glyphicon-gift button.btn.btn-default(ng-click='$close()')=env.t('close') From fe2e0618b8d254b2ada03cce33c2ea60319e71b2 Mon Sep 17 00:00:00 2001 From: GihHubSphinx Date: Sat, 23 May 2015 02:44:32 +0500 Subject: [PATCH 2/2] Make Invite-friends-to-group dialog translatable UI strings of the dialog of invitation to the group made translatable --- common/locales/en/groups.json | 8 +++++++- .../views/shared/modals/invite-friends.jade | 20 +++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/common/locales/en/groups.json b/common/locales/en/groups.json index 6ec6ef0bfb..c78c957713 100644 --- a/common/locales/en/groups.json +++ b/common/locales/en/groups.json @@ -103,5 +103,11 @@ "msgPreviewHeading": "Message Preview", "leaderOnlyChallenges": "Only group leader can create challenges", "sendGift": "Send Gift", - "inviteFriends": "Invite Friends" + "inviteFriends": "Invite Friends", + "inviteAlertInfo": "Invite friends by User ID here.", + "inviteExistUser": "Invite Existing User", + "inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.", + "byColon": "By:", + "inviteNewUsers": "Invite New User(s)", + "inviteAlertInfo2": "Or share this link (copy/paste):" } diff --git a/website/views/shared/modals/invite-friends.jade b/website/views/shared/modals/invite-friends.jade index 1d3b586a29..36b1c21596 100644 --- a/website/views/shared/modals/invite-friends.jade +++ b/website/views/shared/modals/invite-friends.jade @@ -1,26 +1,26 @@ script(type='text/ng-template', id='modals/invite-friends.html') .modal-header - h4 Invite Friends + h4=env.t('inviteFriends') .modal-body - p.alert.alert-info Invite friends by User ID here. + p.alert.alert-info!=env.t('inviteAlertInfo') form.form-inline(ng-submit='invite()') //-.alert.alert-danger(ng-show='_groupError') {{_groupError}} .form-group input.form-control(type='text', placeholder=env.t('userId'), ng-model='invitee') |  - button.btn.btn-primary(type='submit') Invite Existing User + button.btn.btn-primary(type='submit')=env.t('inviteExistUser') hr - p.alert.alert-info Invite friends by email. If they join via your email, they'll automatically be invited to this group. + p.alert.alert-info=env.t('inviteByEmail') form.form-horizontal(ng-submit='inviteEmails()') table.table.table-striped thead tr - th Name - th Email + th=env.t('name') + th=env.t('email') tbody tr(ng-repeat='email in emails') td @@ -33,16 +33,16 @@ script(type='text/ng-template', id='modals/invite-friends.html') i.glyphicon.glyphicon-plus tr td.form-group(colspan=2) - label.col-sm-1.control-label By: + label.col-sm-1.control-label=env.t('byColon') .col-sm-7 input.form-control(type='text', ng-model='inviter') .col-sm-4 - button.btn.btn-primary(type='submit') Invite New User(s) + button.btn.btn-primary(type='submit')=env.t('inviteNewUsers') //- hr - p.alert.alert-info Or share this link (copy/paste): + p.alert.alert-info=env.t('inviteAlertInfo2') input.form-control(type='text', ng-value='inviteLink({id: party._id, inviter: user._id, name: party.name})') .modal-footer - button.btn.btn-default(ng-click='$close()') Close + button.btn.btn-default(ng-click='$close()')=env.t('close')