dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8419
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-10-07 13:11:09 +0200
message:
  Translations
modified:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/menu.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/profile.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css


--
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-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties	2012-10-06 12:30:22 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties	2012-10-07 11:11:09 +0000
@@ -65,4 +65,15 @@
 data_set_report=Data set report
 search_for_charts_maps_reports=Search for charts, maps and reports
 no_hits=No hits, try again
-profile=Profile
\ No newline at end of file
+profile=Profile
+introduction=Introduction
+works_as=Works as
+employed_at=Employed at
+education=Education
+interested_in=Interested in
+speaks=Speaks
+birthday=Birthday
+gender=Gender
+nationality=Nationality
+email=Email
+phone_number=Phone number

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/menu.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/menu.vm	2012-06-03 17:20:55 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/menu.vm	2012-10-07 11:11:09 +0000
@@ -7,6 +7,7 @@
 
 <ul>
 	<li><a href="index.action">$i18n.getString( "dashboard" )&nbsp;</a></li>
+	<li><a href="profile.action?id=${currentUser.uid}">$i18n.getString( "profile" )&nbsp;</a></li>
 	<li><a href="message.action">$i18n.getString( "messages" )&nbsp;</a></li>
 	<li><a href="interpretation.action">$i18n.getString( "interpretations" )&nbsp;</a></li>
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/profile.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/profile.vm	2012-10-06 12:30:22 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/profile.vm	2012-10-07 11:11:09 +0000
@@ -1,14 +1,14 @@
 
 <h3>$encoder.htmlEncode( $user.firstName ) $encoder.htmlEncode( $user.surname  )</h3>
 
-<div class="userRow"><div class="userLabel">Introduction</div><div class="userInfo">$encoder.htmlEncode( $user.introduction )</div></div>
-<div class="userRow"><div class="userLabel">Works as</div><div class="userInfo">$encoder.htmlEncode( $user.jobTitle )</div></div>
-<div class="userRow"><div class="userLabel">Employed at</div><div class="userInfo">$encoder.htmlEncode( $user.employer )</div></div>
-<div class="userRow"><div class="userLabel">Education</div><div class="userInfo">$encoder.htmlEncode( $user.jobTitle )</div></div>
-<div class="userRow"><div class="userLabel">Interested in</div><div class="userInfo">$encoder.htmlEncode( $user.jobTitle )</div></div>
-<div class="userRow"><div class="userLabel">Speaks</div><div class="userInfo">$encoder.htmlEncode( $user.languages )</div></div>
-<div class="userRow"><div class="userLabel">Birthday</div><div class="userInfo">$format.formatDate( $user.birthday )</div></div>
-<div class="userRow"><div class="userLabel">Gender</div><div class="userInfo">$encoder.htmlEncode( $user.gender )</div></div>
-<div class="userRow"><div class="userLabel">Nationality</div><div class="userInfo">$encoder.htmlEncode( $user.nationality )</div></div>
-<div class="userRow"><div class="userLabel">Email</div><div class="userInfo">$encoder.htmlEncode( $user.email )</div></div>
-<div class="userRow"><div class="userLabel">Phone number</div><div class="userInfo">$encoder.htmlEncode( $user.birthday )</div></div>
+<div class="userRow"><div class="userLabel">$i18n.getString( "introduction" )</div><div class="userInfo">$!encoder.htmlEncode( $user.introduction )</div></div>
+<div class="userRow"><div class="userLabel">$i18n.getString( "works_as" )</div><div class="userInfo">$!encoder.htmlEncode( $user.jobTitle )</div></div>
+<div class="userRow"><div class="userLabel">$i18n.getString( "employed_at" )</div><div class="userInfo">$!encoder.htmlEncode( $user.employer )</div></div>
+<div class="userRow"><div class="userLabel">$i18n.getString( "education" )</div><div class="userInfo">$!encoder.htmlEncode( $user.jobTitle )</div></div>
+<div class="userRow"><div class="userLabel">$i18n.getString( "interested_in" )</div><div class="userInfo">$!encoder.htmlEncode( $user.jobTitle )</div></div>
+<div class="userRow"><div class="userLabel">$i18n.getString( "speaks" )</div><div class="userInfo">$!encoder.htmlEncode( $user.languages )</div></div>
+<div class="userRow"><div class="userLabel">$i18n.getString( "birthday" )</div><div class="userInfo">$!format.formatDate( $user.birthday )</div></div>
+<div class="userRow"><div class="userLabel">$i18n.getString( "gender" )</div><div class="userInfo">$!encoder.htmlEncode( $user.gender )</div></div>
+<div class="userRow"><div class="userLabel">$i18n.getString( "nationality" )</div><div class="userInfo">$!encoder.htmlEncode( $user.nationality )</div></div>
+<div class="userRow"><div class="userLabel">$i18n.getString( "email" )</div><div class="userInfo">$!encoder.htmlEncode( $user.email )</div></div>
+<div class="userRow"><div class="userLabel">$i18n.getString( "phone_number" )</div><div class="userInfo">$!encoder.htmlEncode( $user.phoneNumber )</div></div>

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-10-06 12:30:22 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-10-07 11:11:09 +0000
@@ -373,14 +373,3 @@
   display: inline;
   font-size: 11pt;
 }
-
-
-
-
-
-
-
-
-
-
-