Commit 448a0862 authored by Fatih Acet's avatar Fatih Acet 🙌

Merge branch 'js-i18n-t-directories' into 'master'

Internationalisation of javascript/t* directories

See merge request gitlab-org/gitlab-ce!27748
parents a8347c22 8a7792bd
Pipeline #59436578 passed with stages
in 46 minutes and 57 seconds
......@@ -3,6 +3,7 @@
import $ from 'jquery';
import Api from '../api';
import TemplateSelector from '../blob/template_selector';
import { __ } from '~/locale';
export default class IssuableTemplateSelector extends TemplateSelector {
constructor(...args) {
......@@ -25,7 +26,7 @@ export default class IssuableTemplateSelector extends TemplateSelector {
$('.no-template', this.dropdown.parent()).on('click', () => {
this.currentTemplate.content = '';
this.setInputValueToTemplateContent();
$('.dropdown-toggle-text', this.dropdown).text('Choose a template');
$('.dropdown-toggle-text', this.dropdown).text(__('Choose a template'));
});
}
......
......@@ -4,6 +4,7 @@ import { Terminal } from 'xterm';
import * as fit from 'xterm/lib/addons/fit/fit';
import * as webLinks from 'xterm/lib/addons/webLinks/webLinks';
import { canScrollUp, canScrollDown } from '~/lib/utils/dom_utils';
import { __ } from '~/locale';
const SCROLL_MARGIN = 5;
......@@ -78,7 +79,8 @@ export default class GLTerminal {
}
handleSocketFailure() {
this.terminal.write('\r\nConnection failure');
this.terminal.write('\r\n');
this.terminal.write(__('Connection failure'));
}
addScrollListener(onScrollLimit) {
......
......@@ -1740,6 +1740,9 @@ msgstr ""
msgid "Choose a role permission"
msgstr ""
msgid "Choose a template"
msgstr ""
msgid "Choose a template..."
msgstr ""
......@@ -2606,6 +2609,9 @@ msgstr ""
msgid "Connect repositories from GitHub"
msgstr ""
msgid "Connection failure"
msgstr ""
msgid "Container Registry"
msgstr ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment