Sync with main

3 files changed, 24 insertions, 9 deletions

diff --git a/settings/accounts/ui/MastodonSettingsDisplay.qml b/settings/accounts/ui/MastodonSettingsDisplay.qml
index 1ee276e..c03221a 100644
--- a/settings/accounts/ui/MastodonSettingsDisplay.qml
+++ b/settings/accounts/ui/MastodonSettingsDisplay.qml
@@ -37,7 +37,8 @@ StandardAccountSettingsDisplay {
         var providerDisplayName = root.accountProvider && root.accountProvider.displayName
                 ? root.accountProvider.displayName.toString().trim()
                 : ""
-        return providerDisplayName.length > 0 ? providerDisplayName : "Mastodon"
+        //% "Mastodon"
+        return providerDisplayName.length > 0 ? providerDisplayName : qsTrId("settings-accounts-mastodon-la-provider_name")
     }
 
     onAboutToSaveAccount: {
@@ -106,10 +107,20 @@ StandardAccountSettingsDisplay {
             id: syncServicesRepeater
             TextSwitch {
                 checked: model.enabled
-                text: model.displayName
+                text: model.serviceName === "mastodon-microblog"
+                        //% "Posts"
+                        ? qsTrId("settings-accounts-mastodon-la-service_posts")
+                        : (model.serviceName === "mastodon-notifications"
+                           //% "Notifications"
+                           ? qsTrId("settings-accounts-mastodon-la-service_notifications")
+                           : model.displayName)
                 description: model.serviceName === "mastodon-microblog"
-                        ? "Show Mastodon posts in the Events view."
-                        : ""
+                        //% "Show Mastodon posts in the Events view."
+                        ? qsTrId("settings-accounts-mastodon-la-service_posts_description")
+                        : (model.serviceName === "mastodon-notifications"
+                           //% "Show Mastodon notifications."
+                           ? qsTrId("settings-accounts-mastodon-la-service_notifications_description")
+                           : "")
                 visible: text.length > 0
                 onCheckedChanged: {
                     if (checked) {
@@ -124,8 +135,10 @@ StandardAccountSettingsDisplay {
         TextSwitch {
             id: eventsSyncSwitch
 
-            text: "Sync Mastodon feed automatically"
-            description: "Fetch new posts periodically when browsing Events Mastodon feed."
+            //% "Sync Mastodon feed automatically"
+            text: qsTrId("settings-accounts-mastodon-la-auto_sync_feed")
+            //% "Fetch new posts periodically when browsing Events Mastodon feed."
+            description: qsTrId("settings-accounts-mastodon-la-auto_sync_feed_description")
 
             onCheckedChanged: {
                 autoSyncConf.value = checked
diff --git a/settings/accounts/ui/mastodon-update.qml b/settings/accounts/ui/mastodon-update.qml
index 98dba8c..75c043d 100644
--- a/settings/accounts/ui/mastodon-update.qml
+++ b/settings/accounts/ui/mastodon-update.qml
@@ -175,7 +175,8 @@ AccountCredentialsAgent {
         var clientId = _valueFromServiceConfig(config, "auth/oauth2/web_server/ClientId")
         var clientSecret = _valueFromServiceConfig(config, "auth/oauth2/web_server/ClientSecret")
         if (clientId.length === 0 || clientSecret.length === 0) {
-            credentialsUpdateError("Missing Mastodon OAuth client credentials")
+            //% "Missing Mastodon OAuth client credentials"
+            credentialsUpdateError(qsTrId("settings-accounts-mastodon-la-missing_client_credentials"))
             return
         }
 
diff --git a/settings/accounts/ui/mastodon.qml b/settings/accounts/ui/mastodon.qml
index e7cf255..a32f336 100644
--- a/settings/accounts/ui/mastodon.qml
+++ b/settings/accounts/ui/mastodon.qml
@@ -366,12 +366,13 @@ AccountCreationAgent {
             function configure() {
                 hasConfigured = true
 
-                var services = ["mastodon-microblog", "mastodon-sharing"]
+                var services = ["mastodon-microblog", "mastodon-notifications", "mastodon-sharing"]
                 var providerDisplayName = root.accountProvider && root.accountProvider.displayName
                         ? root.accountProvider.displayName.toString().trim()
                         : ""
                 if (providerDisplayName.length === 0) {
-                    providerDisplayName = "Mastodon"
+                    //% "Mastodon"
+                    providerDisplayName = qsTrId("settings-accounts-mastodon-la-provider_name")
                 }
                 newAccount.displayName = providerDisplayName