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.

Sign up for GitHub

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

Updates translation keys to use new Intl plugin translations #16

Closed
wants to merge 4 commits into from
Closed

Updates translation keys to use new Intl plugin translations #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe40077
use mew intl plugin translations
sgiehl Jun 12, 2015
031d823
.travis.yml file is out of date, auto-updating .travis.yml file.
Jun 12, 2015
758fc06
require piwik version, which contains new translation keys
sgiehl Jun 24, 2015
7b44a60
.travis.yml file is out of date, auto-updating .travis.yml file.
Jun 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ install:
- rm -rf plugins/$PLUGIN_NAME
- mv ../$PLUGIN_NAME plugins

# make sure travis test scripts are always latest (so in older releases/branches, the latest scripts will still be used)
- git checkout master -q -- ./tests/travis ./plugins/TestRunner || true
# clone dependent repos
- ./tests/travis/checkout_dependent_plugins.sh

Expand All @@ -68,6 +66,9 @@ before_script:
# add always_populate_raw_post_data=-1 to php.ini
- echo "always_populate_raw_post_data=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini

# disable opcache to avoid random failures on travis
- echo "opcache.enable=0" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini

- ./tests/travis/configure_git.sh

# print out mysql information
Expand Down
2 changes: 1 addition & 1 deletion plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Create custom Alerts to be notified of important changes on your website or app! ",
"version": "0.1.20",
"require": {
"piwik": ">=2.11.0-b2"
"piwik": ">=2.14.0-b8"
},
"authors": [
{
Expand Down
6 changes: 3 additions & 3 deletions templates/form.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
<tr>
<td class="first"><label for="period">{{ 'General_Period'|translate }}</label></td>
<td><select class="period inp" name="period" id="period">
<option value="day" {% if alert and alert.period == 'day' %}selected="selected"{% endif %}>{{ 'CoreHome_PeriodDay'|translate }}</option>
<option value="week" {% if alert and alert.period == 'week' %}selected="selected"{% endif %}>{{ 'CoreHome_PeriodWeek'|translate }}</option>
<option value="month" {% if alert and alert.period == 'month' %}selected="selected"{% endif %}>{{ 'CoreHome_PeriodMonth'|translate }}</option>
<option value="day" {% if alert and alert.period == 'day' %}selected="selected"{% endif %}>{{ 'Intl_PeriodDay'|translate }}</option>
<option value="week" {% if alert and alert.period == 'week' %}selected="selected"{% endif %}>{{ 'Intl_PeriodWeek'|translate }}</option>
<option value="month" {% if alert and alert.period == 'month' %}selected="selected"{% endif %}>{{ 'Intl_PeriodMonth'|translate }}</option>
</select></td>
</tr>

Expand Down