From 411bf188bbb9acb48b7bb1a14066f4975e036940 Mon Sep 17 00:00:00 2001 From: mayaeh Date: Wed, 1 Jul 2020 18:34:19 +0900 Subject: follow-up #14149 (#14192) ran `yarn manage:translations en` --- .../mastodon/locales/defaultMessages.json | 70 ++++++++++++++++++++-- app/javascript/mastodon/locales/en.json | 6 ++ 2 files changed, 72 insertions(+), 4 deletions(-) (limited to 'app/javascript') diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index 96c08f4d8..fc624dcc0 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -492,6 +492,22 @@ }, { "descriptors": [ + { + "defaultMessage": "Public", + "id": "privacy.public.short" + }, + { + "defaultMessage": "Unlisted", + "id": "privacy.unlisted.short" + }, + { + "defaultMessage": "Followers-only", + "id": "privacy.private.short" + }, + { + "defaultMessage": "Direct", + "id": "privacy.direct.short" + }, { "defaultMessage": "Filtered", "id": "status.filtered" @@ -647,6 +663,31 @@ ], "path": "app/javascript/mastodon/features/account_timeline/index.json" }, + { + "descriptors": [ + { + "defaultMessage": "No comment provided", + "id": "account_note.placeholder" + }, + { + "defaultMessage": "Cancel", + "id": "account_note.cancel" + }, + { + "defaultMessage": "Save", + "id": "account_note.save" + }, + { + "defaultMessage": "Your note for @{name}", + "id": "account.account_note_header" + }, + { + "defaultMessage": "Edit", + "id": "account_note.edit" + } + ], + "path": "app/javascript/mastodon/features/account/components/account_note.json" + }, { "descriptors": [ { @@ -777,6 +818,10 @@ "defaultMessage": "Open moderation interface for @{name}", "id": "status.admin_account" }, + { + "defaultMessage": "Add note for @{name}", + "id": "account.add_account_note" + }, { "defaultMessage": "Follows you", "id": "account.follows_you" @@ -2465,6 +2510,27 @@ ], "path": "app/javascript/mastodon/features/status/components/card.json" }, + { + "descriptors": [ + { + "defaultMessage": "Public", + "id": "privacy.public.short" + }, + { + "defaultMessage": "Unlisted", + "id": "privacy.unlisted.short" + }, + { + "defaultMessage": "Followers-only", + "id": "privacy.private.short" + }, + { + "defaultMessage": "Direct", + "id": "privacy.direct.short" + } + ], + "path": "app/javascript/mastodon/features/status/components/detailed_status.json" + }, { "descriptors": [ { @@ -2992,10 +3058,6 @@ "defaultMessage": "Exit full screen", "id": "video.exit_fullscreen" }, - { - "defaultMessage": "Download file", - "id": "video.download" - }, { "defaultMessage": "Sensitive content", "id": "status.sensitive_warning" diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index e051c59bb..1212f2b36 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -1,4 +1,6 @@ { + "account.account_note_header": "Your note for @{name}", + "account.add_account_note": "Add note for @{name}", "account.add_or_remove_from_list": "Add or Remove from lists", "account.badges.bot": "Bot", "account.badges.group": "Group", @@ -40,6 +42,10 @@ "account.unfollow": "Unfollow", "account.unmute": "Unmute @{name}", "account.unmute_notifications": "Unmute notifications from @{name}", + "account_note.cancel": "Cancel", + "account_note.edit": "Edit", + "account_note.placeholder": "No comment provided", + "account_note.save": "Save", "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.", "alert.rate_limited.title": "Rate limited", "alert.unexpected.message": "An unexpected error occurred.", -- cgit From 4babf5b8b5ba8eca5a14f3b2813775240db8f8f1 Mon Sep 17 00:00:00 2001 From: ThibG Date: Wed, 1 Jul 2020 13:51:50 +0200 Subject: Fix lock icon not being shown when locking account in profile settings (#14190) --- app/javascript/packs/public.js | 10 ++++++---- app/javascript/styles/mastodon/accounts.scss | 4 ++++ app/views/application/_card.html.haml | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) (limited to 'app/javascript') diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js index 557823c96..08cc662e6 100644 --- a/app/javascript/packs/public.js +++ b/app/javascript/packs/public.js @@ -207,10 +207,12 @@ function main() { delegate(document, '#account_locked', 'change', ({ target }) => { const lock = document.querySelector('.card .display-name i'); - if (target.checked) { - lock.style.display = 'inline'; - } else { - lock.style.display = 'none'; + if (lock) { + if (target.checked) { + delete lock.dataset.hidden; + } else { + lock.dataset.hidden = 'true'; + } } }); diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss index 5dc067f0e..2c78e81be 100644 --- a/app/javascript/styles/mastodon/accounts.scss +++ b/app/javascript/styles/mastodon/accounts.scss @@ -76,6 +76,10 @@ margin-left: 15px; text-align: left; + i[data-hidden] { + display: none; + } + strong { font-size: 15px; color: $primary-text-color; diff --git a/app/views/application/_card.html.haml b/app/views/application/_card.html.haml index e7ecfecd9..909d9ff81 100644 --- a/app/views/application/_card.html.haml +++ b/app/views/application/_card.html.haml @@ -13,4 +13,4 @@ %strong.emojify.p-name= display_name(account, custom_emojify: true) %span = acct(account) - = fa_icon('lock') if account.locked? + = fa_icon('lock', { :data => ({hidden: true} unless account.locked?)}) -- cgit From e9ea960773ee6a1068623374b21d768918fbc93b Mon Sep 17 00:00:00 2001 From: Ariel Date: Wed, 1 Jul 2020 08:52:05 -0300 Subject: Fix cursor type in statuses (#14185) --- app/javascript/styles/mastodon/components.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/javascript') diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index b3f6d5749..58bc0ff8b 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -992,7 +992,7 @@ position: relative; min-height: 54px; border-bottom: 1px solid lighten($ui-base-color, 8%); - cursor: default; + cursor: auto; @supports (-ms-overflow-style: -ms-autohiding-scrollbar) { // Add margin to avoid Edge auto-hiding scrollbar appearing over content. -- cgit From 24508bb8373fb8d5ab9b54e0b2e35469efddca6a Mon Sep 17 00:00:00 2001 From: ThibG Date: Wed, 1 Jul 2020 13:51:50 +0200 Subject: [Glitch] Fix lock icon not being shown when locking account in profile settings Port 4babf5b8b5ba8eca5a14f3b2813775240db8f8f1 to glitch-soc Signed-off-by: Thibaut Girka --- app/javascript/flavours/glitch/styles/accounts.scss | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/javascript') diff --git a/app/javascript/flavours/glitch/styles/accounts.scss b/app/javascript/flavours/glitch/styles/accounts.scss index a827d271a..a5ddde937 100644 --- a/app/javascript/flavours/glitch/styles/accounts.scss +++ b/app/javascript/flavours/glitch/styles/accounts.scss @@ -78,6 +78,10 @@ margin-left: 15px; text-align: left; + i[data-hidden] { + display: none; + } + strong { font-size: 15px; color: $primary-text-color; -- cgit From f60c78ff3e42e321b457a7d63868b49bf56adfda Mon Sep 17 00:00:00 2001 From: Ariel Date: Wed, 1 Jul 2020 08:52:05 -0300 Subject: [Glitch] Fix cursor type in statuses Port e9ea960773ee6a1068623374b21d768918fbc93b to glitch-soc Signed-off-by: Thibaut Girka --- app/javascript/flavours/glitch/styles/components/status.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/javascript') diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss index fe4f16353..a65581136 100644 --- a/app/javascript/flavours/glitch/styles/components/status.scss +++ b/app/javascript/flavours/glitch/styles/components/status.scss @@ -295,7 +295,7 @@ position: relative; height: auto; border-bottom: 1px solid lighten($ui-base-color, 8%); - cursor: default; + cursor: auto; @supports (-ms-overflow-style: -ms-autohiding-scrollbar) { // Add margin to avoid Edge auto-hiding scrollbar appearing over content. -- cgit