Commit d20df54e authored by Clement Ho's avatar Clement Ho

Merge branch 'js-i18n-lib' into 'master'

Internationalisation of lib directory

See merge request gitlab-org/gitlab-ce!27711
parents d5074b1d b95183fb
...@@ -3,7 +3,7 @@ import _ from 'underscore'; ...@@ -3,7 +3,7 @@ import _ from 'underscore';
import timeago from 'timeago.js'; import timeago from 'timeago.js';
import dateFormat from 'dateformat'; import dateFormat from 'dateformat';
import { pluralize } from './text_utility'; import { pluralize } from './text_utility';
import { languageCode, s__ } from '../../locale'; import { languageCode, s__, __ } from '../../locale';
window.timeago = timeago; window.timeago = timeago;
...@@ -63,7 +63,15 @@ export const pad = (val, len = 2) => `0${val}`.slice(-len); ...@@ -63,7 +63,15 @@ export const pad = (val, len = 2) => `0${val}`.slice(-len);
* @returns {String} * @returns {String}
*/ */
export const getDayName = date => export const getDayName = date =>
['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][date.getDay()]; [
__('Sunday'),
__('Monday'),
__('Tuesday'),
__('Wednesday'),
__('Thursday'),
__('Friday'),
__('Saturday'),
][date.getDay()];
/** /**
* @example * @example
...@@ -320,13 +328,13 @@ export const getSundays = date => { ...@@ -320,13 +328,13 @@ export const getSundays = date => {
} }
const daysToSunday = [ const daysToSunday = [
'Saturday', __('Saturday'),
'Friday', __('Friday'),
'Thursday', __('Thursday'),
'Wednesday', __('Wednesday'),
'Tuesday', __('Tuesday'),
'Monday', __('Monday'),
'Sunday', __('Sunday'),
]; ];
const month = date.getMonth(); const month = date.getMonth();
...@@ -336,7 +344,7 @@ export const getSundays = date => { ...@@ -336,7 +344,7 @@ export const getSundays = date => {
while (dateOfMonth.getMonth() === month) { while (dateOfMonth.getMonth() === month) {
const dayName = getDayName(dateOfMonth); const dayName = getDayName(dateOfMonth);
if (dayName === 'Sunday') { if (dayName === __('Sunday')) {
sundays.push(new Date(dateOfMonth.getTime())); sundays.push(new Date(dateOfMonth.getTime()));
} }
......
import { BYTES_IN_KIB } from './constants'; import { BYTES_IN_KIB } from './constants';
import { sprintf, __ } from '~/locale';
/** /**
* Function that allows a number with an X amount of decimals * Function that allows a number with an X amount of decimals
...@@ -72,13 +73,13 @@ export function bytesToGiB(number) { ...@@ -72,13 +73,13 @@ export function bytesToGiB(number) {
*/ */
export function numberToHumanSize(size) { export function numberToHumanSize(size) {
if (size < BYTES_IN_KIB) { if (size < BYTES_IN_KIB) {
return `${size} bytes`; return sprintf(__('%{size} bytes'), { size });
} else if (size < BYTES_IN_KIB * BYTES_IN_KIB) { } else if (size < BYTES_IN_KIB * BYTES_IN_KIB) {
return `${bytesToKiB(size).toFixed(2)} KiB`; return sprintf(__('%{size} KiB'), { size: bytesToKiB(size).toFixed(2) });
} else if (size < BYTES_IN_KIB * BYTES_IN_KIB * BYTES_IN_KIB) { } else if (size < BYTES_IN_KIB * BYTES_IN_KIB * BYTES_IN_KIB) {
return `${bytesToMiB(size).toFixed(2)} MiB`; return sprintf(__('%{size} MiB'), { size: bytesToMiB(size).toFixed(2) });
} }
return `${bytesToGiB(size).toFixed(2)} GiB`; return sprintf(__('%{size} GiB'), { size: bytesToGiB(size).toFixed(2) });
} }
/** /**
......
...@@ -193,6 +193,18 @@ msgstr "" ...@@ -193,6 +193,18 @@ msgstr ""
msgid "%{service_title} settings saved, but not activated." msgid "%{service_title} settings saved, but not activated."
msgstr "" msgstr ""
msgid "%{size} GiB"
msgstr ""
msgid "%{size} KiB"
msgstr ""
msgid "%{size} MiB"
msgstr ""
msgid "%{size} bytes"
msgstr ""
msgid "%{spammable_titlecase} was submitted to Akismet successfully." msgid "%{spammable_titlecase} was submitted to Akismet successfully."
msgstr "" msgstr ""
...@@ -4482,6 +4494,9 @@ msgstr "" ...@@ -4482,6 +4494,9 @@ msgstr ""
msgid "Found errors in your .gitlab-ci.yml:" msgid "Found errors in your .gitlab-ci.yml:"
msgstr "" msgstr ""
msgid "Friday"
msgstr ""
msgid "From %{providerTitle}" msgid "From %{providerTitle}"
msgstr "" msgstr ""
...@@ -9984,6 +9999,9 @@ msgstr "" ...@@ -9984,6 +9999,9 @@ msgstr ""
msgid "This will remove the fork relationship to source project" msgid "This will remove the fork relationship to source project"
msgstr "" msgstr ""
msgid "Thursday"
msgstr ""
msgid "Time before an issue gets scheduled" msgid "Time before an issue gets scheduled"
msgstr "" msgstr ""
...@@ -10387,6 +10405,9 @@ msgstr "" ...@@ -10387,6 +10405,9 @@ msgstr ""
msgid "Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now." msgid "Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now."
msgstr "" msgstr ""
msgid "Tuesday"
msgstr ""
msgid "Twitter" msgid "Twitter"
msgstr "" msgstr ""
...@@ -10879,6 +10900,9 @@ msgstr "" ...@@ -10879,6 +10900,9 @@ msgstr ""
msgid "Webhooks Help" msgid "Webhooks Help"
msgstr "" msgstr ""
msgid "Wednesday"
msgstr ""
msgid "Welcome to your Issue Board!" msgid "Welcome to your Issue Board!"
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