Merge pull request mozilla-b2g#5672 from lightsofapollo/calendar-bug-…

…797550 Bug 797550 localize today / month / week / day <- in view selector r=mic...
deanlandolt · Oct 4, 2012 · a9d3bf3 · a9d3bf3
2 parents 9fbae8a + 3f8e733
commit a9d3bf3
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/apps/calendar/index.html b/apps/calendar/index.html
@@ -184,18 +184,18 @@ <h1 id="selected-day-title" class="day-title"></h1>
 
   <menu id="view-selector">
     <li class="today">
-      <a href="#today">Today</a>
+      <a data-l10n-id="show-today" href="#today">Today</a>
     </li>
     <li class="time-selection">
       <menu>
         <li class="month">
-          <a href="/month/">Month</a>
+          <a data-l10n-id="show-month-view" href="/month/">Month</a>
         </li>
         <li class="week">
-          <a href="/week/">Week</a>
+          <a data-l10n-id="show-week-view" href="/week/">Week</a>
         </li>
         <li class="day">
-          <a href="/day/">Day</a>
+          <a data-l10n-id="show-day-view" href="/day/">Day</a>
         </li>
       </menu>
     </li>

diff --git a/apps/calendar/locales/calendar.en-US.properties b/apps/calendar/locales/calendar.en-US.properties
@@ -1,34 +1,51 @@
+# generic
 back=Back
 save=Save
 hide=Hide
 cancel=Cancel
 confirm=Confirm
 done=Done
 
+# time view selector
+show-today=Today
+show-month-view=Month
+show-week-view=Week
+show-day-view=Day
+
+# settings
 settings-show=Settings
 settings-hide=Hide Settings
 
+# add records
 add-account=Add an account
 new-event=Add Event
 add-event-header=Event
 
+# account
 account-header=Account
 account-list-header=Accounts
+
+# advanced settings
 settings-header=Calendars
 advanced-settings=Calendar Settings
 advanced-settings-header=Calendar Settings
 advanced-settings-personalization=Personalization
 
+# create account
 field-user.placeholder=Username
 field-password.placeholder=Password
 field-full-url.placeholder=URL
 
+# presets
+
 preset-caldav=CalDav
 preset-yahoo=Yahoo!
 preset-google=Google
 preset-local=Offline Calendar
 calendar-local=Offline Calendar
 
+# create event
+
 event-title.placeholder=Title
 event-location.placeholder=Where?
 event-description.placeholder=Notes
@@ -39,16 +56,22 @@ event-start-time.placeholder=Start Time
 event-end-time.placeholder=End Time
 event-delete=Delete Event
 
+# remove account
+
 remove-account-data=Remove Local Data
 remove-account-dialog=Remove Account
 remove-account-dialog-details=Removing this account will also remove your local copy of associated calendars and events.
 
+# sync
+
 sync-frequency=Sync Calendar
 sync-frequency-manual.textContent=Manually
 sync-frequency-15min.textContent=15 min
 sync-frequency-30min.textContent=30 min
 sync-frequency-hourly.textContent=Each hour
 
+# alarms
+
 alarm-starting={{title}} started {{distance}}
 alarm-started={{title}} starting in {{distance}}