I18N JS files starting with u
This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
This commit is contained in:
Brandon Labuschagne
parent
f59a63115e
commit
d4ed2f74e3
3 changed files with 50 additions and 15 deletions
|
|
@ -2,6 +2,7 @@ import $ from 'jquery';
|
|||
import axios from './lib/utils/axios_utils';
|
||||
import Flash, { hideFlash } from './flash';
|
||||
import { parseBoolean } from './lib/utils/common_utils';
|
||||
import { __ } from './locale';
|
||||
|
||||
export default () => {
|
||||
$('body').on('click', '.js-usage-consent-action', e => {
|
||||
|
|
@ -25,7 +26,7 @@ export default () => {
|
|||
})
|
||||
.catch(() => {
|
||||
hideConsentMessage();
|
||||
Flash('Something went wrong. Try again later.');
|
||||
Flash(__('Something went wrong. Try again later.'));
|
||||
});
|
||||
});
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
import $ from 'jquery';
|
||||
import _ from 'underscore';
|
||||
import axios from './lib/utils/axios_utils';
|
||||
import { __ } from './locale';
|
||||
import { s__, __, sprintf } from './locale';
|
||||
import ModalStore from './boards/stores/modal_store';
|
||||
|
||||
// TODO: remove eventHub hack after code splitting refactor
|
||||
|
|
@ -157,14 +157,20 @@ function UsersSelect(currentUser, els, options = {}) {
|
|||
.get(0);
|
||||
|
||||
if (selectedUsers.length === 0) {
|
||||
return 'Unassigned';
|
||||
return s__('UsersSelect|Unassigned');
|
||||
} else if (selectedUsers.length === 1) {
|
||||
return firstUser.name;
|
||||
} else if (isSelected) {
|
||||
const otherSelected = selectedUsers.filter(s => s !== selectedUser.id);
|
||||
return `${selectedUser.name} + ${otherSelected.length} more`;
|
||||
return sprintf(s__('UsersSelect|%{name} + %{length} more'), {
|
||||
name: selectedUser.name,
|
||||
length: otherSelected.length,
|
||||
});
|
||||
} else {
|
||||
return `${firstUser.name} + ${selectedUsers.length - 1} more`;
|
||||
return sprintf(s__('UsersSelect|%{name} + %{length} more'), {
|
||||
name: firstUser.name,
|
||||
length: selectedUsers.length - 1,
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -218,11 +224,11 @@ function UsersSelect(currentUser, els, options = {}) {
|
|||
tooltipTitle = _.escape(user.name);
|
||||
} else {
|
||||
user = {
|
||||
name: 'Unassigned',
|
||||
name: s__('UsersSelect|Unassigned'),
|
||||
username: '',
|
||||
avatar: '',
|
||||
};
|
||||
tooltipTitle = __('Assignee');
|
||||
tooltipTitle = s__('UsersSelect|Assignee');
|
||||
}
|
||||
$value.html(assigneeTemplate(user));
|
||||
$collapsedSidebar.attr('title', tooltipTitle).tooltip('_fixTitle');
|
||||
|
|
@ -233,7 +239,11 @@ function UsersSelect(currentUser, els, options = {}) {
|
|||
'<% if( avatar ) { %> <a class="author-link" href="/<%- username %>"> <img width="24" class="avatar avatar-inline s24" alt="" src="<%- avatar %>"> </a> <% } else { %> <i class="fa fa-user"></i> <% } %>',
|
||||
);
|
||||
assigneeTemplate = _.template(
|
||||
'<% if (username) { %> <a class="author-link bold" href="/<%- username %>"> <% if( avatar ) { %> <img width="32" class="avatar avatar-inline s32" alt="" src="<%- avatar %>"> <% } %> <span class="author"><%- name %></span> <span class="username"> @<%- username %> </span> </a> <% } else { %> <span class="no-value assign-yourself"> No assignee - <a href="#" class="js-assign-yourself"> assign yourself </a> </span> <% } %>',
|
||||
`<% if (username) { %> <a class="author-link bold" href="/<%- username %>"> <% if( avatar ) { %> <img width="32" class="avatar avatar-inline s32" alt="" src="<%- avatar %>"> <% } %> <span class="author"><%- name %></span> <span class="username"> @<%- username %> </span> </a> <% } else { %> <span class="no-value assign-yourself">
|
||||
${sprintf(s__('UsersSelect|No assignee - %{openingTag} assign yourself %{closingTag}'), {
|
||||
openingTag: '<a href="#" class="js-assign-yourself">',
|
||||
closingTag: '</a>',
|
||||
})}</span> <% } %>`,
|
||||
);
|
||||
return $dropdown.glDropdown({
|
||||
showMenuAbove: showMenuAbove,
|
||||
|
|
@ -302,7 +312,7 @@ function UsersSelect(currentUser, els, options = {}) {
|
|||
showDivider += 1;
|
||||
users.unshift({
|
||||
beforeDivider: true,
|
||||
name: 'Unassigned',
|
||||
name: s__('UsersSelect|Unassigned'),
|
||||
id: 0,
|
||||
});
|
||||
}
|
||||
|
|
@ -310,7 +320,7 @@ function UsersSelect(currentUser, els, options = {}) {
|
|||
showDivider += 1;
|
||||
name = showAnyUser;
|
||||
if (name === true) {
|
||||
name = 'Any User';
|
||||
name = s__('UsersSelect|Any User');
|
||||
}
|
||||
anyUser = {
|
||||
beforeDivider: true,
|
||||
|
|
@ -596,7 +606,7 @@ function UsersSelect(currentUser, els, options = {}) {
|
|||
showEmailUser = $(select).data('emailUser');
|
||||
firstUser = $(select).data('firstUser');
|
||||
return $(select).select2({
|
||||
placeholder: 'Search for a user',
|
||||
placeholder: __('Search for a user'),
|
||||
multiple: $(select).hasClass('multiselect'),
|
||||
minimumInputLength: 0,
|
||||
query: function(query) {
|
||||
|
|
@ -621,7 +631,7 @@ function UsersSelect(currentUser, els, options = {}) {
|
|||
}
|
||||
if (showNullUser) {
|
||||
nullUser = {
|
||||
name: 'Unassigned',
|
||||
name: s__('UsersSelect|Unassigned'),
|
||||
id: 0,
|
||||
};
|
||||
data.results.unshift(nullUser);
|
||||
|
|
@ -629,7 +639,7 @@ function UsersSelect(currentUser, els, options = {}) {
|
|||
if (showAnyUser) {
|
||||
name = showAnyUser;
|
||||
if (name === true) {
|
||||
name = 'Any User';
|
||||
name = s__('UsersSelect|Any User');
|
||||
}
|
||||
anyUser = {
|
||||
name: name,
|
||||
|
|
@ -645,7 +655,7 @@ function UsersSelect(currentUser, els, options = {}) {
|
|||
) {
|
||||
var trimmed = query.term.trim();
|
||||
emailUser = {
|
||||
name: 'Invite "' + trimmed + '" by email',
|
||||
name: sprintf(__('Invite "%{trimmed}" by email'), { trimmed }),
|
||||
username: trimmed,
|
||||
id: trimmed,
|
||||
invite: true,
|
||||
|
|
@ -688,7 +698,7 @@ UsersSelect.prototype.initSelection = function(element, callback) {
|
|||
id = $(element).val();
|
||||
if (id === '0') {
|
||||
nullUser = {
|
||||
name: 'Unassigned',
|
||||
name: s__('UsersSelect|Unassigned'),
|
||||
};
|
||||
return callback(nullUser);
|
||||
} else if (id !== '') {
|
||||
|
|
|
|||
|
|
@ -5249,6 +5249,9 @@ msgstr ""
|
|||
msgid "Invite"
|
||||
msgstr ""
|
||||
|
||||
msgid "Invite \"%{trimmed}\" by email"
|
||||
msgstr ""
|
||||
|
||||
msgid "Invite group"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -8429,6 +8432,9 @@ msgstr ""
|
|||
msgid "Search for a group"
|
||||
msgstr ""
|
||||
|
||||
msgid "Search for a user"
|
||||
msgstr ""
|
||||
|
||||
msgid "Search for projects, issues, etc."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -8923,6 +8929,9 @@ msgstr ""
|
|||
msgid "Something went wrong. Please try again."
|
||||
msgstr ""
|
||||
|
||||
msgid "Something went wrong. Try again later."
|
||||
msgstr ""
|
||||
|
||||
msgid "Sorry, no projects matched your search"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -10726,6 +10735,21 @@ msgstr ""
|
|||
msgid "Users were successfully added."
|
||||
msgstr ""
|
||||
|
||||
msgid "UsersSelect|%{name} + %{length} more"
|
||||
msgstr ""
|
||||
|
||||
msgid "UsersSelect|Any User"
|
||||
msgstr ""
|
||||
|
||||
msgid "UsersSelect|Assignee"
|
||||
msgstr ""
|
||||
|
||||
msgid "UsersSelect|No assignee - %{openingTag} assign yourself %{closingTag}"
|
||||
msgstr ""
|
||||
|
||||
msgid "UsersSelect|Unassigned"
|
||||
msgstr ""
|
||||
|
||||
msgid "Using required encryption strategy when encrypted field is missing!"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue