Skip to content

Commit

Permalink
Merge pull request #8357 from RocketChat/fix-missing-i18n
Browse files Browse the repository at this point in the history
[FIX] Missing i18n translations
  • Loading branch information
rodrigok authored Sep 29, 2017
2 parents d2d3084 + 011e885 commit 3468d78
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,7 @@
"clear_history": "Clear History",
"Click_here": "Click here",
"Click_here_for_more_info": "Click here for more info",
"Click_to_join": "Click to Join!",
"Client_ID": "Client ID",
"Client_Secret": "Client Secret",
"Clients_will_refresh_in_a_few_seconds": "Clients will refresh in a few seconds",
Expand Down Expand Up @@ -1663,6 +1664,7 @@
"Start_video_call": "Start video call",
"Start_with_s_for_user_or_s_for_channel_Eg_s_or_s": "Start with <code class=\"inline\">%s</code> for user or <code class=\"inline\">%s</code> for channel. Eg: <code class=\"inline\">%s</code> or <code class=\"inline\">%s</code>",
"Started_At": "Started At",
"Started_a_video_call": "Started a Video Call",
"Statistics": "Statistics",
"Statistics_reporting": "Send statistics to Rocket.Chat",
"Statistics_reporting_Description": "By sending your statistics, you'll help us identify how many instances of Rocket.Chat are deployed, as well as how good the system is behaving, so we can further improve it. Don't worry, as no user information is sent and all the information we receive is kept confidential.",
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui/client/views/app/room.html
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ <h2>
<div class="upload-progress-text">
{{name}}... {{percentage}}%
<button>
{{_ "cancel"}}
{{_ "Cancel"}}
</button>
</div>
{{/if}}
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-videobridge/lib/messageType.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Meteor.startup(function() {
RocketChat.MessageTypes.registerType({
id: 'jitsi_call_started',
system: true,
message: 'Started a Video Call!'
message: TAPi18n.__('Started_a_video_call')
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Meteor.methods({
RocketChat.models.Rooms.setJitsiTimeout(rid, new Date(currentTime + 35*1000));
RocketChat.models.Messages.createWithTypeRoomIdMessageAndUser('jitsi_call_started', rid, '', Meteor.user(), {
actionLinks : [
{ icon: 'icon-videocam', label: 'Click To Join!', method_id: 'joinJitsiCall', params: ''}
{ icon: 'icon-videocam', label: TAPi18n.__('Click_to_join'), method_id: 'joinJitsiCall', params: ''}
]
});
} else if ((jitsiTimeout - currentTime) / 1000 <= 15) {
Expand Down

0 comments on commit 3468d78

Please sign in to comment.