summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoryosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-04 07:22:53 +0000
committeryosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-04 07:22:53 +0000
commit88f8e4033f6a39e1490523501a5ffa5e8805d7ea (patch)
tree360e1075787fd3d9223602dbf93b6e0f156808f6 /webkit
parent773c2c9e77f71ce6be52b70fba5b84186d0b9c77 (diff)
downloadchromium_src-88f8e4033f6a39e1490523501a5ffa5e8805d7ea.zip
chromium_src-88f8e4033f6a39e1490523501a5ffa5e8805d7ea.tar.gz
chromium_src-88f8e4033f6a39e1490523501a5ffa5e8805d7ea.tar.bz2
This patch adds following strings:
- OtherMonthLabel (for suggestion list) - OtherTimeLabel (for suggestion list) - OtherWeekLabel (for suggestion list) - ThisMonthButtonLabel (for month picker) - ThisWeekButtonLabel (for week picker) defined in http://webkit.org/b/97878, http://webkit.org/b/97633 and http://webkit.org/b/97878 BUG=152632 TEST=done in WebKit layout tests Review URL: https://chromiumcodereview.appspot.com/10985075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webkit_strings.grd24
-rw-r--r--webkit/glue/webkitplatformsupport_impl.cc18
2 files changed, 41 insertions, 1 deletions
diff --git a/webkit/glue/webkit_strings.grd b/webkit/glue/webkit_strings.grd
index 890e7c0..1dcdaf4 100644
--- a/webkit/glue/webkit_strings.grd
+++ b/webkit/glue/webkit_strings.grd
@@ -264,6 +264,30 @@ below:
<message name="IDS_FORM_OTHER_DATE_LABEL" desc="Label for button that opens a full calendar picker so the user can choose dates other than the ones in the list." meaning="for date label">
Other...
</message>
+ <message name="IDS_FORM_OTHER_MONTH_LABEL" desc="Label for button that opens a full month picker so the user can choose dates other than the ones in the list." meaning="for month label">
+ Other...
+ </message>
+ <message name="IDS_FORM_OTHER_TIME_LABEL" desc="Label for button that opens a full time picker so the user can choose dates other than the ones in the list." meaning="for time label">
+ Other...
+ </message>
+ <message name="IDS_FORM_OTHER_WEEK_LABEL" desc="Label for button that opens a full week picker so the user can choose dates other than the ones in the list." meaning="for week label">
+ Other...
+ </message>
+ <message name="IDS_FORM_PLACEHOLDER_FOR_DAY_OF_MONTH_FIELD" desc="Text for denoting day of month field position in date format. Short text is prefered. See http://crbug.com/152632 for samples.">
+ dd
+ </message>
+ <message name="IDS_FORM_PLACEHOLDER_FOR_MONTH_FIELD" desc="Text for denoting month field position in date format. Short text is prefered. See http://crbug.com/152632 for samples.">
+ mm
+ </message>
+ <message name="IDS_FORM_PLACEHOLDER_FOR_YEAR_FIELD" desc="Text for denoting day of month field position in date format. Short text is prefered. See http://crbug.com/152632 for samples.">
+ yyyy
+ </message>
+ <message name="IDS_FORM_THIS_MONTH_LABEL" desc="Label for button in month picker to select this month.">
+ This month
+ </message>
+ <message name="IDS_FORM_THIS_WEEK_LABEL" desc="Label for button in week picker to select this week.">
+ This week
+ </message>
<message name="IDS_RECENT_SEARCHES_NONE" desc="Label for only item in menu that appears when clicking on the search field image, when no searches have been performed">
No recent searches
diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc
index 9212af8..7f91e92 100644
--- a/webkit/glue/webkitplatformsupport_impl.cc
+++ b/webkit/glue/webkitplatformsupport_impl.cc
@@ -199,8 +199,20 @@ static int ToMessageID(WebLocalizedString::Name name) {
return IDS_FORM_FILE_MULTIPLE_UPLOAD;
case WebLocalizedString::OtherColorLabel:
return IDS_FORM_OTHER_COLOR_LABEL;
- case WebLocalizedString::OtherDateLabel:
+ case WebLocalizedString::OtherDateLabel:
return IDS_FORM_OTHER_DATE_LABEL;
+ case WebLocalizedString::OtherMonthLabel:
+ return IDS_FORM_OTHER_MONTH_LABEL;
+ case WebLocalizedString::OtherTimeLabel:
+ return IDS_FORM_OTHER_TIME_LABEL;
+ case WebLocalizedString::OtherWeekLabel:
+ return IDS_FORM_OTHER_WEEK_LABEL;
+ case WebLocalizedString::PlaceholderForDayOfMonthField:
+ return IDS_FORM_PLACEHOLDER_FOR_DAY_OF_MONTH_FIELD;
+ case WebLocalizedString::PlaceholderForMonthField:
+ return IDS_FORM_PLACEHOLDER_FOR_MONTH_FIELD;
+ case WebLocalizedString::PlaceholderForYearField:
+ return IDS_FORM_PLACEHOLDER_FOR_YEAR_FIELD;
case WebLocalizedString::ResetButtonDefaultLabel:
return IDS_FORM_RESET_LABEL;
case WebLocalizedString::SearchableIndexIntroduction:
@@ -213,6 +225,10 @@ static int ToMessageID(WebLocalizedString::Name name) {
return IDS_RECENT_SEARCHES;
case WebLocalizedString::SubmitButtonDefaultLabel:
return IDS_FORM_SUBMIT_LABEL;
+ case WebLocalizedString::ThisMonthButtonLabel:
+ return IDS_FORM_THIS_MONTH_LABEL;
+ case WebLocalizedString::ThisWeekButtonLabel:
+ return IDS_FORM_THIS_WEEK_LABEL;
case WebLocalizedString::ValidationPatternMismatch:
return IDS_FORM_VALIDATION_PATTERN_MISMATCH;
case WebLocalizedString::ValidationRangeOverflow: