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

Simplify update page and fix wording #10864

Merged
merged 2 commits into from Nov 30, 2016
Merged

Simplify update page and fix wording #10864

merged 2 commits into from Nov 30, 2016

Conversation

mattab
Copy link
Member

@mattab mattab commented Nov 14, 2016

fixes #10720

@mattab mattab added Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. labels Nov 14, 2016
@mattab mattab added this to the 3.0.0-b4 milestone Nov 14, 2016
{% if queries is not empty %}
<p><a href="#" id="showSql">› {{ 'CoreUpdater_ClickHereToViewSqlQueries'|translate }}</a></p>
<div id="sqlQueries" style="display:none;">
<pre># FYI: these are the SQL queries that will be executed to upgrade your database to Piwik {{ piwik_version }}<br/>{% for query in queries %}{{ query }}<br/>{% endfor %}</pre>
Copy link
Member

Choose a reason for hiding this comment

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

Translation key missing?

@tsteur
Copy link
Member

tsteur commented Nov 14, 2016

A translation key is missing, otherwise lgtm

@mattab mattab merged commit a30d35b into 3.x-dev Nov 30, 2016
@mattab mattab deleted the 10720b branch November 30, 2016 20:50
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 not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

During upgrade, copy & pasting SQL queries manually does complete the upgrade -> clarify wording
2 participants