mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Uses now proper toLocaleString function

Browse source
This commit is contained in:
Hadi Charara 2022-07-03 14:03:39 -04:00
parent 66f33b368b
commit df39a9a1ff
9 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/cardbuilder/cardBuilder.js
View file

@ -909,13 +909,13 @@ import { appRouter } from '../appRouter';
}
if (options.showYear || options.showSeriesYear) {
const productionYear = item.ProductionYear?.toLocaleString(getCurrentDateTimeLocale(), {useGrouping: false});
const productionYear = datetime.toLocaleString(item.ProductionYear, {useGrouping: false});
if (item.Type === 'Series') {
if (item.Status === 'Continuing') {
lines.push(globalize.translate('SeriesYearToPresent', productionYear || ''));
} else {
if (item.EndDate && item.ProductionYear) {
const endYear = datetime.parseISO8601Date(item.EndDate).getFullYear().toLocaleString(getCurrentDateTimeLocale(), {useGrouping: false});
const endYear = datetime.toLocaleString(datetime.parseISO8601Date(item.EndDate).getFullYear(), {useGrouping: false});
lines.push(productionYear + ((endYear === item.ProductionYear) ? '' : (' - ' + endYear)));
} else {
lines.push(productionYear || '');

2
src/components/imageDownloader/imageDownloader.js
View file

@ -122,7 +122,7 @@ import template from './imageDownloader.template.html';
html += '<span style="margin-right: 10px;">';
const startAtDisplay = totalRecordCount ? startIndex + 1 : 0;
html += globalize.translate('ListPaging', startAtDisplay.toLocaleString(), recordsEnd.toLocaleString(), totalRecordCount.toLocaleString());
html += globalize.translate('ListPaging', startAtDisplay, recordsEnd, totalRecordCount);
html += '</span>';

5
src/components/indicators/indicators.js
View file

@ -3,6 +3,7 @@ import itemHelper from '../itemHelper';
import '../../elements/emby-progressbar/emby-progressbar';
import './indicators.scss';
import 'material-design-icons-iconfont';
import { getCurrentDateTimeLocale } from '../../scripts/globalize';
export function enableProgressIndicator(item) {
if (item.MediaType === 'Video' && item.Type !== 'TvChannel') {
@ -84,7 +85,7 @@ export function getPlayedIndicatorHtml(item) {
if (enablePlayedIndicator(item)) {
const userData = item.UserData || {};
if (userData.UnplayedItemCount) {
return '<div class="countIndicator indicator">' + userData.UnplayedItemCount.toLocaleString() + '</div>';
return '<div class="countIndicator indicator">' + datetime.toLocaleString(userData.UnplayedItemCount) + '</div>';
}
if (userData.PlayedPercentage && userData.PlayedPercentage >= 100 || (userData.Played)) {
@ -99,7 +100,7 @@ export function getChildCountIndicatorHtml(item, options) {
const minCount = options && options.minCount ? options.minCount : 0;
if (item.ChildCount && item.ChildCount > minCount) {
return '<div class="countIndicator indicator">' + item.ChildCount.toLocaleString() + '</div>';
return '<div class="countIndicator indicator">' + datetime.toLocaleString(item.ChildCount) + '</div>';
}
return '';

10
src/components/mediainfo/mediainfo.js
View file

@ -111,8 +111,6 @@ import '../../elements/emby-button/emby-button';
const showFolderRuntime = item.Type === 'MusicAlbum' || item.MediaType === 'MusicArtist' || item.Type === 'Playlist' || item.MediaType === 'Playlist' || item.MediaType === 'MusicGenre';
const dateTimeLocale = getCurrentDateTimeLocale();
if (showFolderRuntime) {
count = item.SongCount || item.ChildCount;
@ -177,13 +175,13 @@ import '../../elements/emby-button/emby-button';
if (options.year !== false && item.ProductionYear && item.Type === 'Series') {
if (item.Status === 'Continuing') {
miscInfo.push(globalize.translate('SeriesYearToPresent', item.ProductionYear.toLocaleString(dateTimeLocale, {useGrouping: false})));
miscInfo.push(globalize.translate('SeriesYearToPresent', datetime.toLocaleString(item.ProductionYear, {useGrouping: false})));
} else if (item.ProductionYear) {
text = item.ProductionYear.toLocaleString(dateTimeLocale, {useGrouping: false});
text = datetime.toLocaleString(item.ProductionYear, {useGrouping: false});
if (item.EndDate) {
try {
const endYear = datetime.parseISO8601Date(item.EndDate).getFullYear().toLocaleString(dateTimeLocale, {useGrouping: false});
const endYear = datetime.toLocaleString(datetime.parseISO8601Date(item.EndDate).getFullYear(), {useGrouping: false});
if (endYear !== item.ProductionYear) {
text += `-${endYear}`;
@ -247,7 +245,7 @@ import '../../elements/emby-button/emby-button';
miscInfo.push(item.ProductionYear);
} else if (item.PremiereDate) {
try {
text = datetime.parseISO8601Date(item.PremiereDate).getFullYear().toLocaleString(dateTimeLocale, {useGrouping: false});
text = datetime.toLocaleString(datetime.parseISO8601Date(item.PremiereDate).getFullYear(), {useGrouping: false});
miscInfo.push(text);
} catch (e) {
console.error('error parsing date:', item.PremiereDate);

2
src/controllers/playback/video/index.js
View file

@ -216,7 +216,7 @@ import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components
let title = itemName;
if (item.PremiereDate) {
try {
const year = datetime.parseISO8601Date(item.PremiereDate).getFullYear().toLocaleString(getCurrentDateTimeLocale(), {useGrouping: false});
const year = datetime.toLocaleString(datetime.parseISO8601Date(item.PremiereDate).getFullYear(), {useGrouping: false});
title += ` (${year})`;
} catch (e) {
console.error(e);

5
src/elements/emby-slider/emby-slider.js
View file

@ -5,7 +5,8 @@ import keyboardnavigation from '../../scripts/keyboardNavigation';
import './emby-slider.scss';
import 'webcomponents.js/webcomponents-lite';
import '../emby-input/emby-input';
import { getIsRTL } from '../../scripts/globalize';
import { getCurrentDateTimeLocale, getIsRTL } from '../../scripts/globalize';
import datetime from '../../scripts/datetime';
/* eslint-disable indent */
@ -129,7 +130,7 @@ import { getIsRTL } from '../../scripts/globalize';
if (range.getBubbleText) {
value = range.getBubbleText(value);
} else {
value = mapFractionToValue(range, value / 100).toLocaleString();
value = datetime.toLocaleString(mapFractionToValue(range, value / 100));
}
value = '<h1 class="sliderBubbleText">' + value + '</h1>';
}

12
src/scripts/datetime.js
View file

@ -1,4 +1,4 @@
import globalize from './globalize';
import globalize, { getCurrentDateTimeLocale } from './globalize';
/* eslint-disable indent */
@ -84,7 +84,7 @@ import globalize from './globalize';
hours = Math.floor(hours);
if (hours) {
parts.push(hours.toLocaleString());
parts.push(toLocaleString(hours));
}
ticks -= (hours * ticksPerHour);
@ -95,9 +95,9 @@ import globalize from './globalize';
ticks -= (minutes * ticksPerMinute);
if (minutes < 10 && hours) {
minutes = (0).toLocaleString() + minutes.toLocaleString();
minutes = toLocaleString(0) + toLocaleString(minutes);
} else {
minutes = minutes.toLocaleString();
minutes = toLocaleString(minutes);
}
parts.push(minutes);
@ -105,9 +105,9 @@ import globalize from './globalize';
seconds = Math.floor(seconds);
if (seconds < 10) {
seconds = (0).toLocaleString() + seconds.toLocaleString();
seconds = toLocaleString(0) + toLocaleString(seconds);
} else {
seconds = seconds.toLocaleString();
seconds = toLocaleString(seconds);
}
parts.push(seconds);

2
src/scripts/globalize.js
View file

@ -213,7 +213,7 @@ import { currentSettings as userSettings } from './settings/userSettings';
export function translate(key) {
let val = translateKey(key);
for (let i = 1; i < arguments.length; i++) {
val = replaceAll(val, '{' + (i - 1) + '}', arguments[i]);
val = replaceAll(val, '{' + (i - 1) + '}', arguments[i].toLocaleString(currentCulture));
}
return val;
}

2
src/scripts/libraryBrowser.js
View file

@ -90,7 +90,7 @@ export function getQueryPagingHtml (options) {
if (showControls) {
html += '<span style="vertical-align:middle;">';
html += globalize.translate('ListPaging', (totalRecordCount ? startIndex + 1 : 0).toLocaleString(), recordsEnd.toLocaleString(), totalRecordCount.toLocaleString());
html += globalize.translate('ListPaging', totalRecordCount ? startIndex + 1 : 0, recordsEnd, totalRecordCount);
html += '</span>';
}