summaryrefslogtreecommitdiff
path: root/locales
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2024-10-15 18:01:57 -0400
committerHazelnoot <acomputerdog@gmail.com>2024-10-15 18:09:11 -0400
commit8a34d8e9d25546f7ef42f072a69f9923d5ba2e84 (patch)
tree4523856296102c786f724243375d198f3fada789 /locales
parentFix indentation on locales/generateDTS.js (diff)
parentmerge: Refresh locales after any change, not just a version update (resolves ... (diff)
downloadsharkey-8a34d8e9d25546f7ef42f072a69f9923d5ba2e84.tar.gz
sharkey-8a34d8e9d25546f7ef42f072a69f9923d5ba2e84.tar.bz2
sharkey-8a34d8e9d25546f7ef42f072a69f9923d5ba2e84.zip
Merge branch 'develop' into feature/2024.9.0
# Conflicts: # locales/en-US.yml # locales/ja-JP.yml # packages/backend/src/core/NoteCreateService.ts # packages/backend/src/core/NoteDeleteService.ts # packages/backend/src/core/NoteEditService.ts # packages/frontend-shared/js/config.ts # packages/frontend/src/boot/common.ts # packages/frontend/src/pages/following-feed.vue # packages/misskey-js/src/autogen/endpoint.ts
Diffstat (limited to 'locales')
-rw-r--r--locales/index.d.ts16
-rw-r--r--locales/version.d.ts1
-rw-r--r--locales/version.js14
3 files changed, 31 insertions, 0 deletions
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 8ccdaebcb9..f27793b860 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -10916,6 +10916,22 @@ export interface Locale extends ILocale {
* Severing all follow relations with {host} queued.
*/
"severAllFollowRelationsQueued": ParameterizedString<"host">;
+ /**
+ * Pending follow requests
+ */
+ "pendingFollowRequests": string;
+ /**
+ * Show quotes
+ */
+ "showQuotes": string;
+ /**
+ * Show replies
+ */
+ "showReplies": string;
+ /**
+ * Show non-public
+ */
+ "showNonPublicNotes": string;
"_mfm": {
/**
* This is not a widespread feature, it may not display properly on most other fedi software, including other Misskey forks
diff --git a/locales/version.d.ts b/locales/version.d.ts
new file mode 100644
index 0000000000..54ceec7443
--- /dev/null
+++ b/locales/version.d.ts
@@ -0,0 +1 @@
+export const localesVersion: string;
diff --git a/locales/version.js b/locales/version.js
new file mode 100644
index 0000000000..e84414b74d
--- /dev/null
+++ b/locales/version.js
@@ -0,0 +1,14 @@
+import { createHash } from 'crypto';
+import locales from './index.js';
+
+// MD5 is acceptable because we don't need cryptographic security.
+const hash = createHash('md5');
+
+// Derive the version hash from locale content exclusively.
+// This avoids the problem of "stuck" translations after modifying locale files.
+const localesText = JSON.stringify(locales);
+hash.update(localesText, 'utf8');
+
+// We can't use regular base64 since this becomes part of a filename.
+// Base64URL avoids special characters that would cause an issue.
+export const localesVersion = hash.digest().toString('base64url');