← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16838: Settings tip text

 

------------------------------------------------------------
revno: 16838
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-09-28 20:52:58 +0200
message:
  Settings tip text
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2014-08-26 07:05:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2014-09-28 18:52:58 +0000
@@ -75,7 +75,8 @@
 no_cache=No cache
 cache_until_6am_tomorrow=Cache until 6 AM tomorrow
 cache_for_two_weeks=Cache for two weeks
-max_levels_to_offline=Maximum offline organisation unit levels
+max_levels_to_offline=Max offline organisation unit levels
+relative_to_current_user=relative to current user
 phone_number_area_code = Phone number area code
 google_analytics_ua_key=Google Analytics (Universal Analytics) key
 application_introduction=Application introduction

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm	2014-09-26 15:49:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm	2014-09-28 18:52:58 +0000
@@ -96,7 +96,7 @@
 </select>
 </div>
 
-<div class="settingLabel">$i18n.getString( "max_levels_to_offline" )</div>
+<div class="settingLabel">$i18n.getString( "max_levels_to_offline" ) <span class="tipText">($i18n.getString( "relative_to_current_user" ))</div>
 
 <div class="setting">
 <select id="offlineOrganisationUnitLevel" name="offlineOrganisationUnitLevel">