Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX: Relative links in translations should work with subfolder #6574

Merged
merged 5 commits into from Nov 8, 2018

Conversation

gschlager
Copy link
Member

@gschlager gschlager commented Nov 7, 2018

Updates translations which contain relative links (HTML and Markdown) so that they work with subfolders. It adds specs to prevent us from adding new translations with the same problem.

This supersedes #6510 which has been reverted.

Do not merge yet. I need to fix translations in a couple of plugins and to work on pushing fixed translations to Transifex, otherwise this commit will invalidate some important translations like read_more_MF and guidelines_topic.

@discoursebot
Copy link

You've signed the CLA, gschlager. Thank you! This pull request is ready for review.

@@ -41,7 +41,7 @@ export default Ember.Component.extend({
classNameBindings: ["isEnabled", "isLoading", "dasherizedDataSourceName"],
classNames: ["admin-report"],
isEnabled: true,
disabledLabel: "admin.dashboard.disabled",
disabledLabel: I18n.t("admin.dashboard.disabled"),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jjaffeux I had to change disabledLabel from being an I18n key to the actual translated string. I hope that doesn't create any problems.

@discoursedangerbot
Copy link

1 Warning
⚠️ This pull request is big! We prefer smaller PRs whenever possible, as they are easier to review. Can this be split into a few smaller PRs?

Generated by 🚫 Danger

@gschlager gschlager merged commit cbd6bd1 into discourse:master Nov 8, 2018
@gschlager gschlager deleted the base_url branch November 8, 2018 23:31
@discoursebot
Copy link

This pull request has been mentioned on Discourse Meta. There might be relevant details there:

https://meta.discourse.org/t/broken-links-in-subfolder-installs/100355/11

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants