mirror of
https://github.com/CompeyDev/fxtwitter-docker.git
synced 2025-04-04 10:00:55 +01:00
Localize new iv strings
This commit is contained in:
dangered wolf
parent
2d78575191
commit
a20294ba1f
7 changed files with 124 additions and 39 deletions
|
|
@ -5,6 +5,9 @@
|
|||
"quotedFrom": "Quoting {name} (@{screen_name})",
|
||||
"replyingTo": "Replying to @{screen_name}",
|
||||
"threadPartHeader": "A part of @${status.author.screen_name}'s thread",
|
||||
"ivAuthorActionReply": "<a href=\"{statusUrl}\">Reply</a> from <b>{authorName}</b> (<a href=\"{authorUrl}\">@{authorScreenName}</a>):",
|
||||
"ivAuthorActionOriginal": "<a href=\"{statusUrl}\">Original</a> from <b>{authorName}</b> (<a href=\"{authorUrl}\">@{authorScreenName}</a>):",
|
||||
"ivAuthorActionFollowUp": "<a href=\"{statusUrl}\">Follow-up</a> from <b>{authorName}</b> (<a href=\"{authorUrl}\">@{authorScreenName}</a>):",
|
||||
|
||||
"photoCount": "Photo {number} / {total}",
|
||||
"videoCount": "Video {number} / {total}",
|
||||
|
|
@ -15,19 +18,21 @@
|
|||
|
||||
"ivOriginalText": "Original text",
|
||||
"ivViewOriginal": "View full thread",
|
||||
"ivViewOriginalStatus": "View full thread",
|
||||
"ivAboutAuthor": "About author",
|
||||
"ivProfileFollowing": "Following",
|
||||
"ivProfileFollowers": "{numFollowers, plural, one {# Follower} other {# Followers}}",
|
||||
"ivProfileStatuses": "{numPosts, plural, one {# Post} other {# Posts}}",
|
||||
"ivProfileFollowing": "{numFollowing, plural, one {Following} other {Following}}",
|
||||
"ivProfileFollowers": "{numFollowers, plural, one {Follower} other {Followers}}",
|
||||
"ivProfileStatuses": "{numPosts, plural, one {Post} other {Posts}}",
|
||||
"ivProfilePictureAlt": "{author}'s profile picture",
|
||||
|
||||
"ivFallbackText": "If you can see this, your browser is doing something weird with your user agent.",
|
||||
"ivInternetArchiveText": "{brandingName} archive",
|
||||
|
||||
"pollFinalResults": "Final results",
|
||||
"pollVotes": "{voteCount, plural, one {# vote} other {# votes}} · {timeLeft}",
|
||||
"ivPollChoice": "{voteCount, plural, one {# vote} other {# votes}}, {percentage}%",
|
||||
|
||||
"ivQuoteHeader": "<a href=\"{url}\">Quoting</a> {authorName} (<a href=\"{authorURL}\">@{authorHandle}</a>)",
|
||||
"ivCommunityNoteHeader": "Readers added context they thought people might want to know",
|
||||
|
||||
"language_af": "Afrikaans",
|
||||
"language_ar": "Arabic",
|
||||
|
|
|
|||
75
package-lock.json
generated
75
package-lock.json
generated
|
|
@ -11,7 +11,8 @@
|
|||
"dependencies": {
|
||||
"@hono/sentry": "^1.0.1",
|
||||
"hono": "^3.12.12",
|
||||
"i18next": "^23.8.2"
|
||||
"i18next": "^23.8.2",
|
||||
"i18next-icu": "^2.3.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@cloudflare/workers-types": "^4.20240423.0",
|
||||
|
|
@ -769,6 +770,55 @@
|
|||
"node": ">=14"
|
||||
}
|
||||
},
|
||||
"node_modules/@formatjs/ecma402-abstract": {
|
||||
"version": "1.18.2",
|
||||
"resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.18.2.tgz",
|
||||
"integrity": "sha512-+QoPW4csYALsQIl8GbN14igZzDbuwzcpWrku9nyMXlaqAlwRBgl5V+p0vWMGFqHOw37czNXaP/lEk4wbLgcmtA==",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"@formatjs/intl-localematcher": "0.5.4",
|
||||
"tslib": "^2.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@formatjs/fast-memoize": {
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.2.0.tgz",
|
||||
"integrity": "sha512-hnk/nY8FyrL5YxwP9e4r9dqeM6cAbo8PeU9UjyXojZMNvVad2Z06FAVHyR3Ecw6fza+0GH7vdJgiKIVXTMbSBA==",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"tslib": "^2.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@formatjs/icu-messageformat-parser": {
|
||||
"version": "2.7.6",
|
||||
"resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.7.6.tgz",
|
||||
"integrity": "sha512-etVau26po9+eewJKYoiBKP6743I1br0/Ie00Pb/S/PtmYfmjTcOn2YCh2yNkSZI12h6Rg+BOgQYborXk46BvkA==",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"@formatjs/ecma402-abstract": "1.18.2",
|
||||
"@formatjs/icu-skeleton-parser": "1.8.0",
|
||||
"tslib": "^2.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@formatjs/icu-skeleton-parser": {
|
||||
"version": "1.8.0",
|
||||
"resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.0.tgz",
|
||||
"integrity": "sha512-QWLAYvM0n8hv7Nq5BEs4LKIjevpVpbGLAJgOaYzg9wABEoX1j0JO1q2/jVkO6CVlq0dbsxZCngS5aXbysYueqA==",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"@formatjs/ecma402-abstract": "1.18.2",
|
||||
"tslib": "^2.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@formatjs/intl-localematcher": {
|
||||
"version": "0.5.4",
|
||||
"resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
|
||||
"integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"tslib": "^2.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@hono/sentry": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@hono/sentry/-/sentry-1.0.1.tgz",
|
||||
|
|
@ -4568,6 +4618,14 @@
|
|||
"@babel/runtime": "^7.23.2"
|
||||
}
|
||||
},
|
||||
"node_modules/i18next-icu": {
|
||||
"version": "2.3.0",
|
||||
"resolved": "https://registry.npmjs.org/i18next-icu/-/i18next-icu-2.3.0.tgz",
|
||||
"integrity": "sha512-x+j7kd5nDJCfbU53uwsMfXD7ALPu5uv0bqjAMQ5nVvXRoj1L7gkmswKtM3XDWYo4YUHf1jznlhSdPyy0xEwU+Q==",
|
||||
"peerDependencies": {
|
||||
"intl-messageformat": "^10.3.3"
|
||||
}
|
||||
},
|
||||
"node_modules/ignore": {
|
||||
"version": "5.3.1",
|
||||
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
|
||||
|
|
@ -4642,6 +4700,18 @@
|
|||
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/intl-messageformat": {
|
||||
"version": "10.5.11",
|
||||
"resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.5.11.tgz",
|
||||
"integrity": "sha512-eYq5fkFBVxc7GIFDzpFQkDOZgNayNTQn4Oufe8jw6YY6OHVw70/4pA3FyCsQ0Gb2DnvEJEMmN2tOaXUGByM+kg==",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"@formatjs/ecma402-abstract": "1.18.2",
|
||||
"@formatjs/fast-memoize": "2.2.0",
|
||||
"@formatjs/icu-messageformat-parser": "2.7.6",
|
||||
"tslib": "^2.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/is-arrayish": {
|
||||
"version": "0.2.1",
|
||||
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
|
||||
|
|
@ -8647,8 +8717,7 @@
|
|||
"node_modules/tslib": {
|
||||
"version": "2.6.2",
|
||||
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
|
||||
"integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
|
||||
"dev": true
|
||||
"integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
|
||||
},
|
||||
"node_modules/type-check": {
|
||||
"version": "0.4.0",
|
||||
|
|
|
|||
|
|
@ -39,7 +39,8 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"@hono/sentry": "^1.0.1",
|
||||
"hono": "^3.12.12",
|
||||
"i18next": "^23.8.2",
|
||||
"hono": "^3.12.12"
|
||||
"i18next-icu": "^2.3.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ export const Constants = {
|
|||
REDIRECT_URL: REDIRECT_URL,
|
||||
RELEASE_NAME: RELEASE_NAME,
|
||||
GIF_TRANSCODE_DOMAIN: GIF_TRANSCODE_DOMAIN,
|
||||
API_DOCS_URL: `https://github.com/dangeredwolf/FixTweet/wiki/API-Home`,
|
||||
API_DOCS_URL: `https://github.com/FixTweet/FxTwitter/wiki/API-Home`,
|
||||
TWITTER_ROOT: 'https://twitter.com',
|
||||
TWITTER_GLOBAL_NAME_ROOT: 'twitter.com',
|
||||
TWITTER_API_ROOT: 'https://api.twitter.com',
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import { renderInstantView } from '../render/instantview';
|
|||
import { constructTwitterThread } from '../providers/twitter/conversation';
|
||||
import { Experiment, experimentCheck } from '../experiments';
|
||||
import i18next from 'i18next';
|
||||
import icu from "i18next-icu";
|
||||
import translationResources from '../../i18n/resources.json';
|
||||
|
||||
export const returnError = (c: Context, error: string): Response => {
|
||||
|
|
@ -128,7 +129,7 @@ export const handleStatus = async (
|
|||
|
||||
let overrideMedia: APIMedia | undefined;
|
||||
|
||||
await i18next.init({
|
||||
await i18next.use(icu).init({
|
||||
lng: language ?? status.lang ?? 'en',
|
||||
debug: true,
|
||||
resources: translationResources,
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ enum AuthorActionType {
|
|||
FollowUp = 'FollowUp'
|
||||
}
|
||||
|
||||
const populateUserLinks = (status: APIStatus, text: string): string => {
|
||||
const populateUserLinks = (text: string): string => {
|
||||
/* TODO: Maybe we can add username splices to our API so only genuinely valid users are linked? */
|
||||
text.match(/@(\w{1,15})/g)?.forEach(match => {
|
||||
const username = match.replace('@', '');
|
||||
|
|
@ -22,7 +22,7 @@ const populateUserLinks = (status: APIStatus, text: string): string => {
|
|||
return text;
|
||||
};
|
||||
|
||||
const generateStatusMedia = (status: APIStatus, author: APIUser): string => {
|
||||
const generateStatusMedia = (status: APIStatus): string => {
|
||||
let media = '';
|
||||
if (status.media?.all?.length) {
|
||||
status.media.all.forEach(mediaItem => {
|
||||
|
|
@ -95,7 +95,7 @@ function getTranslatedText(status: APITwitterStatus, isQuote = false): string |
|
|||
let text = paragraphify(sanitizeText(status.translation?.text), isQuote);
|
||||
text = htmlifyLinks(text);
|
||||
text = htmlifyHashtags(text);
|
||||
text = populateUserLinks(status, text);
|
||||
text = populateUserLinks(text);
|
||||
|
||||
const formatText = `📑 {translation}`.format({
|
||||
translation: i18next.t('translatedFrom').format({
|
||||
|
|
@ -124,16 +124,28 @@ const generateInlineAuthorHeader = (
|
|||
author: APIUser,
|
||||
authorActionType: AuthorActionType | null
|
||||
): string => {
|
||||
return `<h4><i><a href="${status.url}">{AuthorAction}</a> from <b>${author.name}</b> (<a href="${author.url}">@${author.screen_name}</a>):</i></h4>`.format(
|
||||
{
|
||||
AuthorAction:
|
||||
authorActionType === AuthorActionType.Reply
|
||||
? 'Reply'
|
||||
: authorActionType === AuthorActionType.Original
|
||||
? 'Original'
|
||||
: 'Follow-up'
|
||||
}
|
||||
);
|
||||
if (authorActionType === AuthorActionType.Original) {
|
||||
return `<h4><i>${i18next.t('ivAuthorActionOriginal', {
|
||||
statusUrl: status.url,
|
||||
authorName: author.name,
|
||||
authorUrl: author.url,
|
||||
authorScreenName: author.screen_name
|
||||
})}</i></h4>`;
|
||||
} else if (authorActionType === AuthorActionType.FollowUp) {
|
||||
return `<h4><i>${i18next.t('ivAuthorActionFollowUp', {
|
||||
statusUrl: status.url,
|
||||
authorName: author.name,
|
||||
authorUrl: author.url,
|
||||
authorScreenName: author.screen_name
|
||||
})}</i></h4>`;
|
||||
}
|
||||
// Reply / unknown
|
||||
return `<h4><i>${i18next.t('ivAuthorActionReply', {
|
||||
statusUrl: status.url,
|
||||
authorName: author.name,
|
||||
authorUrl: author.url,
|
||||
authorScreenName: author.screen_name
|
||||
})}</i></h4>`;
|
||||
};
|
||||
|
||||
const wrapForeignLinks = (url: string) => {
|
||||
|
|
@ -158,7 +170,7 @@ const generateStatusFooter = (status: APIStatus, isQuote = false, author: APIUse
|
|||
let description = author.description;
|
||||
description = htmlifyLinks(description);
|
||||
description = htmlifyHashtags(description);
|
||||
description = populateUserLinks(status, description);
|
||||
description = populateUserLinks(description);
|
||||
|
||||
return `
|
||||
<p>{socialText}</p>
|
||||
|
|
@ -168,7 +180,7 @@ const generateStatusFooter = (status: APIStatus, isQuote = false, author: APIUse
|
|||
`.format({
|
||||
socialText: getSocialTextIV(status as APITwitterStatus) || '',
|
||||
viewOriginal: !isQuote
|
||||
? `<a href="${status.url}">${i18next.t('ivViewOriginalStatus')}</a>`
|
||||
? `<a href="${status.url}">${i18next.t('ivViewOriginal')}</a>`
|
||||
: notApplicableComment,
|
||||
aboutSection: isQuote
|
||||
? ''
|
||||
|
|
@ -179,13 +191,11 @@ const generateStatusFooter = (status: APIStatus, isQuote = false, author: APIUse
|
|||
<p><b>${description}</b></p>
|
||||
<p>{location} {website} {joined}</p>
|
||||
<p>
|
||||
{following} <b>${i18next.t('ivProfileFollowing')}</b>
|
||||
{followers} <b>${i18next.t('ivProfileFollowers')}</b>
|
||||
{statuses} <b>${i18next.t('ivProfileStatuses')}</b>
|
||||
{following} <b>${i18next.t('ivProfileFollowing', { numFollowing: author.following })}</b>
|
||||
{followers} <b>${i18next.t('ivProfileFollowers', { numFollowers: author.followers })}</b>
|
||||
{statuses} <b>${i18next.t('ivProfileStatuses', { numStatuses: author.statuses })}</b>
|
||||
</p>`.format({
|
||||
pfp: `<img src="${author.avatar_url?.replace('_200x200', '_400x400')}" alt="${
|
||||
author.name
|
||||
}'s profile picture" />`,
|
||||
pfp: `<img src="${author.avatar_url?.replace('_200x200', '_400x400')}" alt="${i18next.t('ivProfilePictureAlt', { author: author.name })}" />`,
|
||||
location: author.location ? `📌 ${author.location}` : '',
|
||||
website: author.website
|
||||
? `🔗 <a rel="nofollow" href="${wrapForeignLinks(author.website.url)}">${author.website.display_url}</a>`
|
||||
|
|
@ -207,10 +217,10 @@ const generatePoll = (poll: APIPoll, language: string): string => {
|
|||
poll.choices.forEach(choice => {
|
||||
const bar = '█'.repeat((choice.percentage / 100) * barLength);
|
||||
// eslint-disable-next-line no-irregular-whitespace
|
||||
str += `${bar}<br>${choice.label}<br>${intlFormat.format(choice.count)} votes, ${intlFormat.format(choice.percentage)}%<br>`;
|
||||
str += `${bar}<br>${choice.label}<br>${i18next.t('ivPollChoice', { voteCount: intlFormat.format(choice.count), percentage: intlFormat.format(choice.percentage)})}<br>`;
|
||||
});
|
||||
/* Finally, add the footer of the poll with # of votes and time left */
|
||||
str += `<br>${intlFormat.format(poll.total_votes)} votes · ${poll.time_left_en}`;
|
||||
str += `<br>${i18next.t('pollVotes', { voteCount: intlFormat.format(poll.total_votes), timeLeft: poll.time_left_en})}`;
|
||||
|
||||
return str;
|
||||
};
|
||||
|
|
@ -245,7 +255,7 @@ const generateCommunityNote = (status: APITwitterStatus): string => {
|
|||
// Add the remaining text after the last link
|
||||
result = `<table>
|
||||
<thead>
|
||||
<th><b>Readers added context they thought people might want to know</b></th>
|
||||
<th><b>${i18next.t('ivCommunityNoteHeader')}</b></th>
|
||||
</thead>
|
||||
<tbody>
|
||||
<th>${result.replace(/\n/g, '\n<br>')}</th>
|
||||
|
|
@ -273,7 +283,7 @@ const generateStatus = (
|
|||
return `<!-- Telegram Instant View -->
|
||||
{quoteHeader}
|
||||
<!-- Embed media -->
|
||||
${generateStatusMedia(status, author)}
|
||||
${generateStatusMedia(status)}
|
||||
<!-- Translated text (if applicable) -->
|
||||
${translatedText ? translatedText : notApplicableComment}
|
||||
<!-- Inline author (if applicable) -->
|
||||
|
|
@ -286,7 +296,7 @@ const generateStatus = (
|
|||
${status.poll ? generatePoll(status.poll, status.lang ?? 'en') : notApplicableComment}
|
||||
<!-- Embedded quote status -->
|
||||
${!isQuote && status.quote ? generateStatus(status.quote, author, true, null) : notApplicableComment}
|
||||
<br>${!isQuote ? `<a href="${status.url}">${i18next.t('ivViewOriginalStatus')}</a>` : notApplicableComment}
|
||||
<br>${!isQuote ? `<a href="${status.url}">${i18next.t('ivViewOriginal')}</a>` : notApplicableComment}
|
||||
`.format({
|
||||
quoteHeader: isQuote
|
||||
? '<h4>' +
|
||||
|
|
@ -339,7 +349,7 @@ export const renderInstantView = (properties: RenderProperties): ResponseInstruc
|
|||
flags?.archive
|
||||
? i18next.t('ivInternetArchiveText').format({ brandingName: Constants.BRANDING_NAME })
|
||||
: i18next.t('ivFallbackText')
|
||||
} <a href="${status.url}">${i18next.t('ivViewOriginalStatus')}</a>
|
||||
} <a href="${status.url}">${i18next.t('ivViewOriginal')}</a>
|
||||
</section>
|
||||
<article>
|
||||
<sub><a href="${status.url}">${i18next.t('ivViewOriginal')}</a></sub>
|
||||
|
|
@ -385,7 +395,7 @@ export const renderInstantView = (properties: RenderProperties): ResponseInstruc
|
|||
})
|
||||
.join('')}
|
||||
${generateStatusFooter(status, false, thread?.author ?? status.author)}
|
||||
<br>${`<a href="${status.url}">View full thread</a>`}
|
||||
<br>${`<a href="${status.url}">${i18next.t('ivViewOriginal')}</a>`}
|
||||
</article>`;
|
||||
|
||||
return instructions;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ import i18next from 'i18next';
|
|||
import { Constants } from '../constants';
|
||||
import { Experiment, experimentCheck } from '../experiments';
|
||||
import { handleQuote } from '../helpers/quote';
|
||||
import { Strings } from '../strings';
|
||||
|
||||
export const renderVideo = (
|
||||
properties: RenderProperties,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue