Commit 77d9da75 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'ee-js-i18n-javascripts-f' into 'master'

i18n EE JS files in directories starting with f

See merge request gitlab-org/gitlab-ee!13487
parents 36a98838 8a003380
import addExtraTokensForMergeRequests from '~/filtered_search/add_extra_tokens_for_merge_requests'; import addExtraTokensForMergeRequests from '~/filtered_search/add_extra_tokens_for_merge_requests';
import { __ } from '~/locale';
export default IssuableTokenKeys => { export default IssuableTokenKeys => {
addExtraTokensForMergeRequests(IssuableTokenKeys); addExtraTokensForMergeRequests(IssuableTokenKeys);
...@@ -7,12 +8,12 @@ export default IssuableTokenKeys => { ...@@ -7,12 +8,12 @@ export default IssuableTokenKeys => {
{ {
url: 'approver_usernames[]=None', url: 'approver_usernames[]=None',
tokenKey: 'approver', tokenKey: 'approver',
value: 'None', value: __('None'),
}, },
{ {
url: 'approver_usernames[]=Any', url: 'approver_usernames[]=Any',
tokenKey: 'approver', tokenKey: 'approver',
value: 'Any', value: __('Any'),
}, },
]; ];
......
...@@ -4,6 +4,7 @@ import { ...@@ -4,6 +4,7 @@ import {
alternativeTokenKeys, alternativeTokenKeys,
conditions, conditions,
} from '~/filtered_search/issuable_filtered_search_token_keys'; } from '~/filtered_search/issuable_filtered_search_token_keys';
import { __ } from '~/locale';
const weightTokenKey = { const weightTokenKey = {
key: 'weight', key: 'weight',
...@@ -18,12 +19,12 @@ const weightConditions = [ ...@@ -18,12 +19,12 @@ const weightConditions = [
{ {
url: 'weight=None', url: 'weight=None',
tokenKey: 'weight', tokenKey: 'weight',
value: 'None', value: __('None'),
}, },
{ {
url: 'weight=Any', url: 'weight=Any',
tokenKey: 'weight', tokenKey: 'weight',
value: 'Any', value: __('Any'),
}, },
]; ];
......
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