From 46bae31b3e702fc205f72629ea11fe9f2024a750 Mon Sep 17 00:00:00 2001 From: jovuit Date: Thu, 14 Feb 2019 10:28:12 +0100 Subject: [PATCH] #662: Resolve "Add contexts to translatable strings" --- CONTRIBUTING.rst | 1 + front/src/components/auth/Login.vue | 22 ++++----- front/src/components/auth/Logout.vue | 6 +-- front/src/components/auth/Profile.vue | 6 +-- front/src/components/auth/Settings.vue | 48 +++++++++---------- .../src/components/auth/SubsonicTokenForm.vue | 34 ++++++------- 6 files changed, 59 insertions(+), 58 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 63cc2d771..1d0fbf940 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -449,6 +449,7 @@ This hierarchical structure is made of several parts: - ``Moderation`` - ``Player`` - ``Playlist`` + - ``Profile`` - ``Favorites`` - ``Notifications`` - ``Radio`` diff --git a/front/src/components/auth/Login.vue b/front/src/components/auth/Login.vue index 09a9c6c29..61be521b5 100644 --- a/front/src/components/auth/Login.vue +++ b/front/src/components/auth/Login.vue @@ -2,20 +2,20 @@
-

Log in to your Funkwhale account

+

Log in to your Funkwhale account

-
We cannot log you in
+
We cannot log you in
    -
  • Please double-check your username/password couple is correct
    • -
  • An unknown error happend, this can mean the server is down or cannot be reached
    • +
  • Please double-check your username/password couple is correct
    • +
  • An unknown error happend, this can mean the server is down or cannot be reached
@@ -80,8 +80,8 @@ export default { }, computed: { labels() { - let usernamePlaceholder = this.$gettext("Enter your username or email") - let title = this.$gettext("Log In") + let usernamePlaceholder = this.$pgettext('Content/Login/Input.Placeholder', "Enter your username or email") + let title = this.$pgettext('Head/Login/Title', "Log In") return { usernamePlaceholder, title diff --git a/front/src/components/auth/Logout.vue b/front/src/components/auth/Logout.vue index 90495f5e0..3582d6367 100644 --- a/front/src/components/auth/Logout.vue +++ b/front/src/components/auth/Logout.vue @@ -3,10 +3,10 @@

- Are you sure you want to log out? + Are you sure you want to log out?

You are currently logged in as %{ username }

- +
@@ -17,7 +17,7 @@ export default { computed: { labels() { return { - title: this.$gettext("Log Out") + title: this.$pgettext('Head/Login/Title', "Log Out") } } } diff --git a/front/src/components/auth/Profile.vue b/front/src/components/auth/Profile.vue index 73c9ab2d9..1aaafd102 100644 --- a/front/src/components/auth/Profile.vue +++ b/front/src/components/auth/Profile.vue @@ -14,14 +14,14 @@
- This is you! + This is you!
- Staff member + Staff member @@ -43,7 +43,7 @@ export default { profile: state => state.auth.profile }), labels() { - let msg = this.$gettext("%{ username }'s profile") + let msg = this.$pgettext('Head/Profile/Title', "%{ username }'s profile") let usernameProfile = this.$gettextInterpolate(msg, { username: this.username }) diff --git a/front/src/components/auth/Settings.vue b/front/src/components/auth/Settings.vue index 8305d0e05..7081e0298 100644 --- a/front/src/components/auth/Settings.vue +++ b/front/src/components/auth/Settings.vue @@ -3,16 +3,16 @@

- Account settings + Account settings

- Settings updated + Settings updated
-
We cannot save your settings
+
Your settings can't be updateds
  • {{ error }}
@@ -25,38 +25,38 @@

- Avatar + Avatar

-
We cannot save your avatar
+
Your avatar cannot be saved
  • {{ error }}
-

Upload a new avatar

-

PNG, GIF or JPG. At most 2MB. Will be downscaled to 400x400px.

+

Upload a new avatar

+

PNG, GIF or JPG. At most 2MB. Will be downscaled to 400x400px.

-

Current avatar

+

Current avatar

@@ -65,43 +65,43 @@

- Change my password + Change my password

- Changing your password will also change your Subsonic API password if you have requested one. You will have to update your password on your clients that use this password. + Changing your password will also change your Subsonic API password if you have requested one. You will have to update your password on your clients that use this password.
- Cannot change your password + Your password cannot be changed
    -
  • Please double-check your password is correct
    • +
  • Please double-check your password is correct
- +
- +
- Change password -

Change your password?

+ Change password +

Change your password?

-

Changing your password will have the following consequences

+

Changing your password will have the following consequences:

    -
  • You will be logged out from this session and have to log in with the new one
    • -
  • Your Subsonic password will be changed to a new, random one, logging you out from devices that used the old Subsonic password
    • +
  • You will be logged out from this session and have to log in with the new one
    • +
  • Your Subsonic password will be changed to a new, random one, logging you out from devices that used the old Subsonic password
-

Disable access

+

Disable access