Merge pull request #1014 from Materialious/update/1.9.20

Update/1.9.20

materialious/android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "us.materialio.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 136
-        versionName "1.9.19"
+        versionCode 137
+        versionName "1.9.20"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

materialious/electron/materialious.metainfo.xml

@@ -71,7 +71,11 @@
     
     
     
-    <release version="1.9.19" date="2025-7-08">
+    
+    <release version="1.9.20" date="2025-7-09">
+      <url>https://github.com/Materialious/Materialious/releases/tag/1.9.20</url>
+    </release>
+<release version="1.9.19" date="2025-7-08">
       <url>https://github.com/Materialious/Materialious/releases/tag/1.9.19</url>
     </release>
 <release version="1.9.18" date="2025-6-25">

materialious/electron/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "Materialious",
-	"version": "1.9.19",
+	"version": "1.9.20",
 	"description": "Modern material design for Invidious.",
 	"author": {
 		"name": "Ward Pearce",
@@ -44,4 +44,4 @@
 		"capacitor",
 		"electron"
 	]
-}
+}

materialious/package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "materialious",
-	"version": "1.9.18",
+	"version": "1.9.19",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "materialious",
-			"version": "1.9.18",
+			"version": "1.9.19",
 			"hasInstallScript": true,
 			"dependencies": {
 				"@capacitor-community/electron": "^5.0.1",

materialious/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "materialious",
-	"version": "1.9.19",
+	"version": "1.9.20",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",

materialious/src/lib/components/Comment.svelte

@@ -7,6 +7,7 @@
 	import { onMount } from 'svelte';
 	import CommentSelf from './Comment.svelte';
 	import { insecureRequestImageHandler } from '$lib/misc';
+	import { _ } from '$lib/i18n';
 
 	interface Props {
 		comment: Comment;
@@ -17,7 +18,7 @@
 
 	let replies: Comments | undefined = $state(undefined);
 
-	const replyText: string = comment.replies?.replyCount > 1 ? 'replies' : 'reply';
+	const replyText: string = comment.replies?.replyCount > 1 ? $_('replies') : $_('reply');
 
 	async function loadReplies(continuation: string) {
 		try {

materialious/src/lib/i18n/index.ts

@@ -23,8 +23,16 @@ const resources: Record<string, () => Promise<Record<string, any>>> = {
 
 function getUserLocale(): string {
 	if (typeof navigator !== 'undefined') {
-		const lang = navigator.language;
-		return resources[lang] ? lang : defaultLocale;
+		for (const lang of navigator.languages) {
+			if (resources[lang]) {
+				return lang;
+			}
+			// In case of a regional code (e.g. 'de-CH'), fallback to the more general lang
+			const baseLang = lang.split('-')[0]
+			if (resources[baseLang]) {
+				return baseLang
+			}
+		}
 	}
 	return defaultLocale;
 }

materialious/src/lib/i18n/locales/de.json

@@ -13,7 +13,9 @@
     "donate": "Spenden",
     "deleteAllHistory": "Gesamten Verlauf löschen",
     "skipping": "Überspringen",
-    "replies": "antworten",
+    "comments": "Kommentare",
+    "reply": "Antwort",
+    "replies": "Antworten",
     "region": "Region",
     "noResult": "Keine Ergebnisse",
     "language": "Sprache",

materialious/src/lib/i18n/locales/en.json

@@ -19,6 +19,8 @@
 	"donate": "Donate",
 	"deleteAllHistory": "Delete all history",
 	"skipping": "Skipping",
+	"comments": "comments",
+	"reply": "reply",
 	"replies": "replies",
 	"region": "Region",
 	"noResult": "No results",

materialious/src/routes/(app)/watch/[slug]/+page.svelte

@@ -469,7 +469,7 @@
 				<details>
 					<summary id="comment-section" class="none bold">
 						<nav>
-							<div class="max">{numberWithCommas(comments.commentCount)} comments</div>
+							<div class="max">{numberWithCommas(comments.commentCount)} {$_('comments')}</div>
 							<i>expand_more</i>
 						</nav>
 					</summary>

update_versions.py

@@ -3,7 +3,7 @@ import os
 import re
 from datetime import datetime
 
-LATEST_VERSION = "1.9.19"
+LATEST_VERSION = "1.9.20"
 RELEASE_DATE = datetime.now().strftime("%Y-%-m-%d")  # Format: YYYY-M-D
 
 WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")