Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Make localization keys compatible with agglutinative and/or SOV type languages #10159

Merged
merged 7 commits into from
Feb 22, 2023
Merged

Make localization keys compatible with agglutinative and/or SOV type languages #10159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7491209
Make localization keys on HelpUserSettingsTab compatible with aggluti…
luixxiul Feb 14, 2023
13bdebe
Make localization keys on room notifications debug dialog on devtools…
luixxiul Feb 14, 2023
0f655bc
Clarify context for Weblate translators
luixxiul Feb 14, 2023
0b1f68c
Merge branch 'develop' into localization-2
luixxiul Feb 14, 2023
118a0da
apply feedback comments
luixxiul Feb 17, 2023
c6974f3
Merge branch 'develop' into localization-2
luixxiul Feb 20, 2023
e62af05
Add a line for zero
luixxiul Feb 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 28 additions & 12 deletions src/components/views/dialogs/devtools/RoomNotifications.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import React, { useContext } from "react";

import MatrixClientContext from "../../../../contexts/MatrixClientContext";
import { useNotificationState } from "../../../../hooks/useRoomNotificationState";
import { _t } from "../../../../languageHandler";
import { _t, _td } from "../../../../languageHandler";
import { determineUnreadState } from "../../../../RoomNotifs";
import { humanReadableNotificationColor } from "../../../../stores/notifications/NotificationColor";
import { doesRoomOrThreadHaveUnreadMessages } from "../../../../Unread";
Expand All @@ -39,22 +39,38 @@ export default function RoomNotifications({ onBack }: IDevtoolsProps): JSX.Eleme
<h2>{_t("Room status")}</h2>
<ul>
<li>
{_t("Room unread status: ")}
<strong>{humanReadableNotificationColor(color)}</strong>
{count > 0 && (
<>
{_t(", count:")} <strong>{count}</strong>
</>
{_t(
"Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>",
{
status: humanReadableNotificationColor(color),
count,
},
{
strong: (sub) => <strong>{sub}</strong>,
},
)}
</li>
<li>
{_t("Notification state is")} <strong>{notificationState}</strong>
{_t(
"Notification state is <strong>%(notificationState)s</strong>",
{
notificationState,
},
{
strong: (sub) => <strong>{sub}</strong>,
},
)}
</li>
<li>
{_t("Room is ")}
<strong>
{cli.isRoomEncrypted(room.roomId!) ? _t("encrypted ✅") : _t("not encrypted 🚨")}
</strong>
{_t(
cli.isRoomEncrypted(room.roomId!)
? _td("Room is <strong>encrypted ✅</strong>")
: _td("Room is <strong>not encrypted 🚨</strong>"),
{},
{
strong: (sub) => <strong>{sub}</strong>,
},
)}
</li>
</ul>
</section>
Expand Down
20 changes: 18 additions & 2 deletions src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,10 +327,26 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
<span className="mx_SettingsTab_subheading">{_t("Advanced")}</span>
<div className="mx_SettingsTab_subsectionText">
<div>
{_t("Homeserver is")} <code>{MatrixClientPeg.get().getHomeserverUrl()}</code>
{_t(
"Homeserver is <code>%(homeserverUrl)s</code>",
{
homeserverUrl: MatrixClientPeg.get().getHomeserverUrl(),
},
{
code: (sub) => <code>{sub}</code>,
},
)}
</div>
<div>
{_t("Identity server is")} <code>{MatrixClientPeg.get().getIdentityServerUrl()}</code>
{_t(
"Identity server is <code>%(identityServerUrl)s</code>",
{
identityServerUrl: MatrixClientPeg.get().getIdentityServerUrl(),
},
{
code: (sub) => <code>{sub}</code>,
},
)}
</div>
<details>
<summary>{_t("Access Token")}</summary>
Expand Down
15 changes: 7 additions & 8 deletions src/i18n/strings/en_EN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1566,8 +1566,8 @@
"FAQ": "FAQ",
"Keyboard Shortcuts": "Keyboard Shortcuts",
"Versions": "Versions",
"Homeserver is": "Homeserver is",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The position of verbs should not be hard coded.

"Identity server is": "Identity server is",
"Homeserver is <code>%(homeserverUrl)s</code>": "Homeserver is <code>%(homeserverUrl)s</code>",
"Identity server is <code>%(identityServerUrl)s</code>": "Identity server is <code>%(identityServerUrl)s</code>",
"Access Token": "Access Token",
"Your access token gives full access to your account. Do not share it with anyone.": "Your access token gives full access to your account. Do not share it with anyone.",
"Clear cache and reload": "Clear cache and reload",
Expand Down Expand Up @@ -3144,12 +3144,11 @@
"Filter results": "Filter results",
"No results found": "No results found",
"Room status": "Room status",
"Room unread status: ": "Room unread status: ",
", count:": ", count:",
"Notification state is": "Notification state is",
"Room is ": "Room is ",
"encrypted ✅": "encrypted ✅",
"not encrypted 🚨": "not encrypted 🚨",
"Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>",
"Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|zero": "Room unread status: <strong>%(status)s</strong>",
"Notification state is <strong>%(notificationState)s</strong>": "Notification state is <strong>%(notificationState)s</strong>",
"Room is <strong>encrypted ✅</strong>": "Room is <strong>encrypted ✅</strong>",
"Room is <strong>not encrypted 🚨</strong>": "Room is <strong>not encrypted 🚨</strong>",
"Main timeline": "Main timeline",
"Total: ": "Total: ",
"Highlight: ": "Highlight: ",
Expand Down
26 changes: 16 additions & 10 deletions test/components/views/dialogs/devtools/__snapshots__/RoomNotifications-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,26 @@ exports[`<RoomNotifications /> should render 1`] = `
</h2>
<ul>
<li>
Room unread status:
<strong>
None
</strong>
<span>
Room unread status:
<strong>
None
</strong>
</span>
</li>
<li>
Notification state is
<strong />
<span>
Notification state is
<strong />
</span>
</li>
<li>
Room is
<strong>
not encrypted 🚨
</strong>
<span>
Room is
<strong>
not encrypted 🚨
</strong>
</span>
</li>
</ul>
</section>
Expand Down