Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-10-04 17:32:34 +08:00
Code Packages Activity Actions 8

FIX: correctly allow to translate my messages (#33586)

Browse source 
We were not correctly converting the key, it was outputting "my
messages" instead of "my_messages".
This commit is contained in:
Joffrey JAFFEUX 2025-07-14 01:48:49 +02:00 • committed by GitHub
parent 5eca6d826e
commit 226bc5c359
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/my-messages-section-link.js
View file

@ -15,12 +15,14 @@ export default class MyMessagesSectionLink extends BaseSectionLink {
}

get title() {
return i18n("sidebar.sections.community.links.my_messages.content");
return i18n("sidebar.sections.community.links.my_messages.title");
}

get text() {
return i18n(
`sidebar.sections.community.links.${this.overridenName.toLowerCase()}.content`,
`sidebar.sections.community.links.${this.overridenName
.toLowerCase()
.replace(" ", "_")}.content`,
{ defaultValue: this.overridenName }
);
}

4
spec/system/page_objects/components/navigation_menu/sidebar.rb
View file

@ -78,10 +78,10 @@ module PageObjects
I18n.t("js.sidebar.sections.community.links.my_messages.content")
end

def has_my_messages_link?
def has_my_messages_link?(text = my_messages)
page.has_css?(
".sidebar-section-link[data-link-name='#{my_messages.downcase.parameterize}']",
text: my_messages,
text:,
)
end


22
spec/system/viewing_sidebar_spec.rb
View file

@ -3,7 +3,7 @@
describe "Viewing sidebar", type: :system do
let(:sidebar) { PageObjects::Components::NavigationMenu::Sidebar.new }

context "as logged in user", type: :system do
context "as logged in user" do
fab!(:admin) { Fabricate(:admin, refresh_auto_groups: true) }
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:category_sidebar_section_link) { Fabricate(:category_sidebar_section_link, user: user) }
@ -36,7 +36,7 @@ describe "Viewing sidebar", type: :system do
end
end

describe "Community sidebar section", type: :system do
describe "Community sidebar section" do
fab!(:user) { Fabricate(:user, locale: "pl_PL") }
fab!(:translation_override) do
TranslationOverride.create!(
@ -180,6 +180,22 @@ describe "Viewing sidebar", type: :system do
visit("/")
expect(sidebar).to have_no_my_messages_link
end

context "with translation override" do
fab!(:translation_override) do
TranslationOverride.create!(
locale: "en",
translation_key: "js.sidebar.sections.community.links.my_messages.content",
value: "Overrided",
)
end

it "is translated" do
sign_in(admin)
visit("/")
expect(sidebar).to have_my_messages_link("Overrided")
end
end
end

it "shouldn't display the panel header for the main sidebar" do
@ -189,7 +205,7 @@ describe "Viewing sidebar", type: :system do
end
end

context "as anonymous user", type: :system do
context "as anonymous user" do
describe "My messages sidebar link" do
it "shouldn't show for anonymous user" do
visit("/")