Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <benaka.moorthi@gmail.com>2013-03-08 02:17:10 +0400
committerdiosmosis <benaka.moorthi@gmail.com>2013-03-08 02:17:10 +0400
commit34d65f2442c8a3d929da1092bb506b0520ab16de (patch)
tree917103c2e47816dfe17d27606561fc49498b0da2
parent19bc4d1dc2ae88f40018e2bbf3c714fbd4ce21ae (diff)
Refs #3456, if geoip updater has not been run, display inline help saying so in geoip updater setup.
-rw-r--r--lang/en.php1
-rwxr-xr-xplugins/UserCountry/templates/updaterSetup.tpl14
2 files changed, 9 insertions, 6 deletions
diff --git a/lang/en.php b/lang/en.php
index 10c74e850a..f3fb9c304f 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -1749,6 +1749,7 @@ And thank you for using Piwik!',
'UserCountry_DownloadNewDatabasesEvery' => 'Update databases every',
'UserCountry_GeoLiteCityLink' => 'If you\'re using the GeoLite City database, use this link: %1$s%2$s%3$s.',
'UserCountry_UpdaterWasLastRun' => 'The updater was last run on %s.',
+ 'UserCountry_UpdaterHasNotBeenRun' => 'The updater has never been run.',
'UserSettings_VisitorSettings' => 'Visitor Settings',
'UserSettings_BrowserFamilies' => 'Browser families',
'UserSettings_Browsers' => 'Browsers',
diff --git a/plugins/UserCountry/templates/updaterSetup.tpl b/plugins/UserCountry/templates/updaterSetup.tpl
index 11d498a9b5..7960526b2e 100755
--- a/plugins/UserCountry/templates/updaterSetup.tpl
+++ b/plugins/UserCountry/templates/updaterSetup.tpl
@@ -39,12 +39,14 @@
<label for="geoip-update-period-week">{'CoreHome_PeriodWeek'|translate}</label>
</td>
<td width="164">
- {if !empty($lastTimeUpdaterRun)}
- {capture assign=lastTimeRunNote}
- {'UserCountry_UpdaterWasLastRun'|translate:$lastTimeUpdaterRun}
- {/capture}
- {$lastTimeRunNote|inlineHelp}
- {/if}
+ {capture assign=lastTimeRunNote}
+ {if !empty($lastTimeUpdaterRun)}
+ {'UserCountry_UpdaterWasLastRun'|translate:$lastTimeUpdaterRun}
+ {else}
+ {'UserCountry_UpdaterHasNotBeenRun'|translate}
+ {/if}
+ {/capture}
+ {$lastTimeRunNote|inlineHelp}
</td>
</tr>
</table>