Commit 9ac7d2a1 authored by Fatih Acet's avatar Fatih Acet

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

i18n of javascript/t* directories

See merge request gitlab-org/gitlab-ee!11858
parents fe13e50e 2b7eb964
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
import $ from 'jquery'; import $ from 'jquery';
import Api from '../api'; import Api from '../api';
import TemplateSelector from '../blob/template_selector'; import TemplateSelector from '../blob/template_selector';
import { __ } from '~/locale';
export default class IssuableTemplateSelector extends TemplateSelector { export default class IssuableTemplateSelector extends TemplateSelector {
constructor(...args) { constructor(...args) {
...@@ -25,7 +26,7 @@ export default class IssuableTemplateSelector extends TemplateSelector { ...@@ -25,7 +26,7 @@ export default class IssuableTemplateSelector extends TemplateSelector {
$('.no-template', this.dropdown.parent()).on('click', () => { $('.no-template', this.dropdown.parent()).on('click', () => {
this.currentTemplate.content = ''; this.currentTemplate.content = '';
this.setInputValueToTemplateContent(); 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'; ...@@ -4,6 +4,7 @@ import { Terminal } from 'xterm';
import * as fit from 'xterm/lib/addons/fit/fit'; import * as fit from 'xterm/lib/addons/fit/fit';
import * as webLinks from 'xterm/lib/addons/webLinks/webLinks'; import * as webLinks from 'xterm/lib/addons/webLinks/webLinks';
import { canScrollUp, canScrollDown } from '~/lib/utils/dom_utils'; import { canScrollUp, canScrollDown } from '~/lib/utils/dom_utils';
import { __ } from '~/locale';
const SCROLL_MARGIN = 5; const SCROLL_MARGIN = 5;
...@@ -78,7 +79,8 @@ export default class GLTerminal { ...@@ -78,7 +79,8 @@ export default class GLTerminal {
} }
handleSocketFailure() { handleSocketFailure() {
this.terminal.write('\r\nConnection failure'); this.terminal.write('\r\n');
this.terminal.write(__('Connection failure'));
} }
addScrollListener(onScrollLimit) { addScrollListener(onScrollLimit) {
......
...@@ -2249,6 +2249,9 @@ msgstr "" ...@@ -2249,6 +2249,9 @@ msgstr ""
msgid "Choose a role permission" msgid "Choose a role permission"
msgstr "" msgstr ""
msgid "Choose a template"
msgstr ""
msgid "Choose a template..." msgid "Choose a template..."
msgstr "" msgstr ""
...@@ -3199,6 +3202,9 @@ msgstr "" ...@@ -3199,6 +3202,9 @@ msgstr ""
msgid "Connecting..." msgid "Connecting..."
msgstr "" msgstr ""
msgid "Connection failure"
msgstr ""
msgid "Contact an owner of group %{namespace_name} to upgrade the plan." msgid "Contact an owner of group %{namespace_name} to upgrade the plan."
msgstr "" 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