Skip to content

Commit

Permalink
Revert "Merge pull request mozilla-b2g#7311 from timdream/settings/sa…
Browse files Browse the repository at this point in the history
…mple-format"

This reverts commit 185a9cd, reversing
changes made to 194062b.
  • Loading branch information
timdream committed Jan 7, 2013
1 parent 844bcf7 commit 4a0244b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion apps/settings/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,7 @@ <h1 data-l10n-id="language"> Language </h1>
</ul>
<dl>
<dt data-l10n-id="simple-format"> Sample Format </dt>
<dt> Sample Format </dt>
<dd id="region-date">Friday, September 28 2012</dd>
<dd id="region-time">06:54 PM</dd>
</dl>
Expand Down
1 change: 0 additions & 1 deletion apps/settings/locales/settings.en-US.properties
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ selectTimezone=Select time zone
languageAndRegion=Language & Region
language=Language
region=Region
simple-format=Sample Format
# see http://www.cplusplus.com/reference/clibrary/ctime/strftime/
longDateFormat=%A, %B %d, %Y

Expand Down

0 comments on commit 4a0244b

Please sign in to comment.