Concatenated strings are hard to localize. Menu items and button texts should...

Concatenated strings are hard to localize. Menu items and button texts should be provided as a complete strings instead of a concatenation of two strings. 
Add UI strings for the permissions drop downs of the Website Settings UI that are easy to localize.


BUG=113688
TEST=None

Review URL: https://chromiumcodereview.appspot.com/10855031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151019 0039d316-1c4b-4281-b951-d872f2087c98

chrome/app/generated_resources.grd

@@ -320,18 +320,27 @@ are declared in build/common.gypi.
       <message name="IDS_WEBSITE_SETTINGS_SITE_DATA_STATS_LINE" desc="The label text with the number of allowed and blocked cookies and site data objects.">
         <ph name="DATA_SOURCE">$1<ex>foo.bar.org</ex></ph> (<ph name="ALLOWED_COUNT">$2<ex>6</ex></ph> Allowed / <ph name="BLOCKED_COUNT">$3<ex>0</ex></ph> Blocked)
       </message>
+      <message name="IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ALLOW" desc="The text of the menu item of a permissions menu on the Website Settings UI that resets the setting to the default setting which is allow.">
+        Use global default (Allow)
+      </message>
+      <message name="IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_BLOCK" desc="The text of the menu item of a permissions menu on the Website Settings UI that resets the setting to the default setting which is block.">
+        Use global default (Block)
+      </message>
+      <message name="IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ASK" desc="The text of the menu item of a permissions menu on the Website Settings UI that reset the setting to the default setting which is ask.">
+        Use global default (Ask)
+      </message>
+      <message name="IDS_WEBSITE_SETTINGS_MENU_ITEM_ALLOW" desc="The text of the menu item of a permissions menu on the Website Settings UI that sets the setting to allow.">
+        Always allow
+      </message>
+      <message name="IDS_WEBSITE_SETTINGS_MENU_ITEM_BLOCK" desc="The text of the menu item of a permissions menu on the Website Settings UI that sets the setting to allow.">
+        Always block
+      </message>
       <message name="IDS_WEBSITE_SETTINGS_DEFAULT_PERMISSION_LABEL" desc="The label for the global default setting that is used in a permissions dropdown.">
         Use global default (<ph name="PERMISSION_VALUE">$1<ex>allow</ex></ph>)
       </message>
       <message name="IDS_WEBSITE_SETTINGS_PERMISSION_LABEL" desc="The label for a permission value that is used in the permissions dropdown.">
         Always <ph name="PERMISSION_VALUE">$1<ex>allow</ex></ph>
       </message>
-      <message name="IDS_WEBSITE_SETTINGS_DEFAULT_SETTING" desc="The label that is used to display permissions for which the global default setting applies.">
-        <ph name="PERMISSION_VALUE">$1<ex>Allowed</ex></ph> by default
-      </message>
-      <message name="IDS_WEBSITE_SETTINGS_USER_SETTING" desc="The label that is used to display permissions for which the user has set a site specific setting.">
-        <ph name="PERMISSION_VALUE">$1<ex>Allowed</ex></ph> by you
-      </message>
       <message name="IDS_WEBSITE_SETTINGS_PERMISSION_TYPE" desc="The label that is used to display permission types in the Website Settings popup. ">
         <ph name="PERMISSION_TYPE_LABEL">$1<ex>Plugins</ex></ph>:
       </message>

chrome/browser/ui/gtk/website_settings_popup_gtk.cc

@@ -459,18 +459,30 @@ void WebsiteSettingsPopupGtk::SetPermissionInfo(
         gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
     GtkTreeIter iter;
     // Add option for permission "Global Default" to the combobox model.
-    std::string setting_str = l10n_util::GetStringFUTF8(
-        IDS_WEBSITE_SETTINGS_DEFAULT_PERMISSION_LABEL,
-        WebsiteSettingsUI::PermissionValueToUIString(
-            permission->default_setting));
+    std::string setting_str;
+    switch (permission->default_setting) {
+      case CONTENT_SETTING_ALLOW:
+        setting_str = l10n_util::GetStringUTF8(
+            IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ALLOW);
+        break;
+      case CONTENT_SETTING_BLOCK:
+        setting_str = l10n_util::GetStringUTF8(
+            IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_BLOCK);
+        break;
+      case CONTENT_SETTING_ASK:
+        setting_str = l10n_util::GetStringUTF8(
+            IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ASK);
+        break;
+      default:
+        break;
+    }
     gtk_list_store_append(store, &iter);
     gtk_list_store_set(store, &iter, 0, setting_str.c_str(), 1,
                        CONTENT_SETTING_DEFAULT, 2, permission->type, -1);
     GtkWidget* combo_box = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store));
     // Add option for permission "Allow" to the combobox model.
-    setting_str = l10n_util::GetStringFUTF8(
-        IDS_WEBSITE_SETTINGS_PERMISSION_LABEL,
-        WebsiteSettingsUI::PermissionValueToUIString(CONTENT_SETTING_ALLOW));
+    setting_str = l10n_util::GetStringUTF8(
+        IDS_WEBSITE_SETTINGS_MENU_ITEM_ALLOW);
     gtk_list_store_append(store, &iter);
     gtk_list_store_set(store, &iter, 0, setting_str.c_str(), 1,
                        CONTENT_SETTING_ALLOW, 2, permission->type, -1);
@@ -478,9 +490,8 @@ void WebsiteSettingsPopupGtk::SetPermissionInfo(
     // blocking.
     if (permission->type != CONTENT_SETTINGS_TYPE_FULLSCREEN) {
       // Add option for permission "BLOCK" to the combobox model.
-      setting_str = l10n_util::GetStringFUTF8(
-          IDS_WEBSITE_SETTINGS_PERMISSION_LABEL,
-          WebsiteSettingsUI::PermissionValueToUIString(CONTENT_SETTING_BLOCK));
+      setting_str = l10n_util::GetStringUTF8(
+          IDS_WEBSITE_SETTINGS_MENU_ITEM_BLOCK);
       gtk_list_store_append(store, &iter);
       gtk_list_store_set(store, &iter, 0, setting_str.c_str(), 1,
                          CONTENT_SETTING_BLOCK, 2, permission->type, -1);

chrome/browser/ui/views/website_settings/permission_selector_view.cc

@@ -128,20 +128,32 @@ PermissionMenuModel::PermissionMenuModel(
       default_setting_(default_setting),
       current_setting_(current_setting),
       permission_selector_(parent) {
-  string16 label = l10n_util::GetStringFUTF16(
-      IDS_WEBSITE_SETTINGS_DEFAULT_PERMISSION_LABEL,
-      WebsiteSettingsUI::PermissionValueToUIString(default_setting_));
+  string16 label;
+  switch (default_setting_) {
+    case CONTENT_SETTING_ALLOW:
+      label = l10n_util::GetStringUTF16(
+          IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ALLOW);
+      break;
+    case CONTENT_SETTING_BLOCK:
+      label = l10n_util::GetStringUTF16(
+          IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_BLOCK);
+      break;
+    case CONTENT_SETTING_ASK:
+      label = l10n_util::GetStringUTF16(
+          IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ASK);
+      break;
+    default:
+      break;
+  }
   AddCheckItem(COMMAND_SET_TO_DEFAULT, label);
 
-  label = l10n_util::GetStringFUTF16(
-      IDS_WEBSITE_SETTINGS_PERMISSION_LABEL,
-      WebsiteSettingsUI::PermissionValueToUIString(CONTENT_SETTING_ALLOW));
+  label = l10n_util::GetStringUTF16(
+      IDS_WEBSITE_SETTINGS_MENU_ITEM_ALLOW);
   AddCheckItem(COMMAND_SET_TO_ALLOW, label);
 
   if (site_permission != CONTENT_SETTINGS_TYPE_FULLSCREEN) {
-    label = l10n_util::GetStringFUTF16(
-        IDS_WEBSITE_SETTINGS_PERMISSION_LABEL,
-        WebsiteSettingsUI::PermissionValueToUIString(CONTENT_SETTING_BLOCK));
+    label = l10n_util::GetStringUTF16(
+        IDS_WEBSITE_SETTINGS_MENU_ITEM_BLOCK);
     AddCheckItem(COMMAND_SET_TO_BLOCK, label);
   }
 }