forked/topola-viewer
1
0
Fork 0
mirror of https://github.com/PeWu/topola-viewer.git synced 2026-07-24 04:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgraded to the newest version of react-intl

Browse Source
This commit is contained in:
Przemek Wiech
2021-04-02 00:40:57 +02:00
parent 44e1954dda
commit df5ae76180
13 changed files with 653 additions and 778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/util/date_util.ts
View File

@@ -1,5 +1,5 @@
import {Date as TopolaDate, DateOrRange, DateRange, getDate} from 'topola';
import {InjectedIntl} from 'react-intl';
import {IntlShape} from 'react-intl';
const DATE_QUALIFIERS = new Map([
['abt', 'about'],
@@ -7,7 +7,7 @@ const DATE_QUALIFIERS = new Map([
['est', 'estimated'],
]);
function formatDate(date: TopolaDate, intl: InjectedIntl) {
function formatDate(date: TopolaDate, intl: IntlShape) {
const hasDay = date.day !== undefined;
const hasMonth = date.month !== undefined;
const hasYear = date.year !== undefined;
@@ -41,7 +41,7 @@ function formatDate(date: TopolaDate, intl: InjectedIntl) {
return [translatedQualifier, translatedDate].join(' ');
}
function formatDateRage(dateRange: DateRange, intl: InjectedIntl) {
function formatDateRage(dateRange: DateRange, intl: IntlShape) {
const fromDate = dateRange.from;
const toDate = dateRange.to;
const translatedFromDate = fromDate && formatDate(fromDate, intl);
@@ -79,7 +79,7 @@ function formatDateRage(dateRange: DateRange, intl: InjectedIntl) {
/** Formats a DateOrRange object. */
export function formatDateOrRange(
dateOrRange: DateOrRange | undefined,
intl: InjectedIntl,
intl: IntlShape,
): string {
if (!dateOrRange) {
return '';
@@ -94,6 +94,6 @@ export function formatDateOrRange(
}
/** Formats a date given in GEDCOM format. */
export function translateDate(gedcomDate: string, intl: InjectedIntl): string {
export function translateDate(gedcomDate: string, intl: IntlShape): string {
return formatDateOrRange(getDate(gedcomDate), intl);
}

4
src/util/error_i18n.ts
View File

@@ -1,11 +1,11 @@
import {InjectedIntl} from 'react-intl';
import {IntlShape} from 'react-intl';
import {TopolaError} from './error';
/**
* Returns a translated message for the given error. If the message can't be
* translated, the original error.message is returned.
*/
export function getI18nMessage(error: Error, intl: InjectedIntl): string {
export function getI18nMessage(error: Error, intl: IntlShape): string {
if (!(error instanceof TopolaError)) {
return error.message;
}