Navigation Menu

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

No longer show "this is demo.piwik.org" message in top control #12111

Merged
merged 2 commits into from Sep 25, 2017

Conversation

tsteur
Copy link
Member

@tsteur tsteur commented Sep 25, 2017

Removing some special code for demo.piwik.org which should not be in core. We will instead add this in a different plugin.

I also updated the translation key YouAreViewingDemoShortMessage in the hope this will invalidate all existing translations? I don't want to have the whole sentence as a link as it does not look nice and it is not as much noticeable as a link.

@tsteur tsteur added the Needs Review PRs that need a code review label Sep 25, 2017
@tsteur tsteur added this to the 3.1.2 milestone Sep 25, 2017
lang/en.json Outdated
@@ -432,7 +432,7 @@
"YearsDays": "%1$s years %2$s days",
"Yes": "Yes",
"YouAreCurrentlyUsing": "You are currently using Piwik %s.",
"YouAreViewingDemoShortMessage": "You are viewing the demo of Piwik",
"YouAreViewingDemoShortMessage": "You are viewing the demo of %1$sPiwik%2$s",
Copy link
Member

Choose a reason for hiding this comment

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

It does not look like the translation key was modified?

Copy link
Member Author

Choose a reason for hiding this comment

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

What do you mean?

Copy link
Member

Choose a reason for hiding this comment

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

you wrote "I also updated the translation key YouAreViewingDemoShortMessage" but only the string was updated. IIRC you need to change the translation key as well to ensure the string will be re-translated? (although in this case it may work because the translations will miss the %1$s and won't be valid)

Copy link
Member Author

Choose a reason for hiding this comment

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

That's what I was wondering whether I have to change it or not. Ideally we would keep the name as it is descriptive but can simply change it.

@mattab mattab merged commit 7a7c756 into 3.x-dev Sep 25, 2017
@mattab mattab deleted the nopiwikorgmessage branch September 25, 2017 02:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs Review PRs that need a code review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants