Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Force some words to translate in other languages #13367

Merged
merged 4 commits into from
Mar 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -2168,6 +2168,7 @@
"Permalink": "Permalink",
"Permissions": "Permissions",
"Personal_Access_Tokens": "Personal Access Tokens",
"Phone_number": "Phone number",
"pin-message": "Pin Message",
"pin-message_description": "Permission to pin a message in a channel",
"Pin_Message": "Pin Message",
Expand Down
14 changes: 7 additions & 7 deletions packages/rocketchat-ui-flextab/client/tabs/userInfo.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ <h3 title="{{name}}" class="rc-user-info__name"><i class="status-{{status}}"></i
<div class="rc-user-info-details">
{{#if roleTags}}
<div class="rc-user-info-details__item">
<label class="rc-user-info-details__label ">Roles</label>
<label class="rc-user-info-details__label">{{_ "Roles"}}</label>
<ul class="chip-container current-user-roles">
{{#each roleTags}}
<li class="role-tag" title="{{description}}">{{description}}</li>
Expand All @@ -60,36 +60,36 @@ <h3 title="{{name}}" class="rc-user-info__name"><i class="status-{{status}}"></i
{{#if hasPermission 'view-full-other-user-info'}}
{{#if hasEmails}}
<div class="rc-user-info-details__item">
<label class="rc-user-info-details__label ">Email address</label>
<label class="rc-user-info-details__label">{{_ "Email"}}</label>
{{#each emails}} <a href="mailto:{{address}}" class="rc-user-info-details__info">{{address}}{{#if verified}}&nbsp;<i class="icon-ok success-color"></i>{{/if}}</a> {{/each}}
</div>
{{/if}}
{{#if hasPhone}}
<div class="rc-user-info-details__item">
<label class="rc-user-info-details__label ">Phone number</label>
<label class="rc-user-info-details__label">{{_ "Phone_number"}}</label>
{{#each phone}} <a href="tel:{{phoneNumber}}" class="rc-user-info-details__info">{{phoneNumber}}</a> {{/each}}
</div>
{{/if}}
{{#if createdAt}}
<div class="rc-user-info-details__item">
<label class="rc-user-info-details__label ">{{_ "Created_at"}}</label>
<label class="rc-user-info-details__label">{{_ "Created_at"}}</label>
<p class="rc-user-info-details__info">{{createdAt}}</p>
</div>
<div class="rc-user-info-details__item">
<label class="rc-user-info-details__label ">{{_ "Last_login"}}</label>
<label class="rc-user-info-details__label">{{_ "Last_login"}}</label>
<p class="rc-user-info-details__info">{{lastLogin}}</p>
</div>
{{/if}}
{{#if shouldDisplayReason}}
<div class="rc-user-info-details__item">
<label class="rc-user-info-details__label ">{{_ "Reason_To_Join"}}</label>
<label class="rc-user-info-details__label">{{_ "Reason_To_Join"}}</label>
<p class="rc-user-info-details__info">{{user.reason}}</p>
</div>
{{/if}}
{{/if}}
{{#if utc}}
<div class="rc-user-info-details__item">
<label class="rc-user-info-details__label">Timezone</label>
<label class="rc-user-info-details__label">{{_ "Timezone"}}</label>
<p class="rc-user-info-details__info">{{userTime}} (UTC {{utc}})</p>
</div>
{{/if}}
Expand Down