#767244 by Magnus: Fix some untranslatable strings due to less than and greater than...

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 58aa23a..07bb162 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -117,6 +117,7 @@ Views 6.x-3.0-dev
     o #428196 by dereine, funkmasterjones and tic2000: Allow specification of default sort order (asc or desc) per field in table style.
     o #944680 by rvilar: Properly t() untranslated string.
     o #881680 by brianV and longwave: Avoid unnecessary invoking of view objects for argument validation when no argument validation is necessary.
+    o #767244 by Magnus: Fix some untranslatable strings due to less than and greater than characters.
 
 Views 6.x-3.0-alpha3
     o #705668 by dereine: Fix glossary view, add tests for glossary view.

diff --git a/handlers/views_handler_argument.inc b/handlers/views_handler_argument.inc
index 1d507da..2422878 100644 (file)
--- a/handlers/views_handler_argument.inc
+++ b/handlers/views_handler_argument.inc
@@ -198,7 +198,7 @@ class views_handler_argument extends views_handler {
       '#default_value' => $this->options['validate_type'],
     );
 
-    $validate_types = array('none' => t('<Basic validation>'));
+    $validate_types = array('none' => t('- Basic validation -'));
     $plugins = views_fetch_plugin_data('argument validator');
     foreach ($plugins as $id => $info) {
       if (!empty($info['no ui'])) {

diff --git a/includes/admin.inc b/includes/admin.inc
index bb3092e..f6b32bc 100644 (file)
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -244,14 +244,14 @@ function views_ui_list_views_form(&$form_state) {
     );
   }
 
-  $all = array('all' => t('<All>'));
-  $none = array('none' => t('<None>'));
+  $all = array('all' => t('- All -'));
+  $none = array('none' => t('- None -'));
 
   $form['type'] = array(
     '#type' => 'select',
     '#title' => t('Storage'),
     '#options' => array(
-      'all' => t('<All>'),
+      'all' => t('- All -'),
       t('Normal') => t('Normal'),
       t('Default') => t('Default'),
       t('Overridden') => t('Overridden'),
@@ -3002,7 +3002,7 @@ function views_ui_add_item_form(&$form_state) {
   $options = views_fetch_fields(array_keys($base_tables), $type, $display->handler->use_group_by());
 
   if (!empty($options)) {
-    $groups = array('all' => t('<All>'));
+    $groups = array('all' => t('- All -'));
     $form['group'] = array(
       '#type' => 'select',
       '#title' => t('Groups'),

diff --git a/plugins/views_plugin_style.inc b/plugins/views_plugin_style.inc
index 7ca591c..79ac5c7 100644 (file)
--- a/plugins/views_plugin_style.inc
+++ b/plugins/views_plugin_style.inc
@@ -88,7 +88,7 @@ class views_plugin_style extends views_plugin {
     // key to FALSE.
     // @TODO: Document "uses grouping" in docs.php when docs.php is written.
     if ($this->uses_fields() && $this->definition['uses grouping']) {
-      $options = array('' => t('<None>'));
+      $options = array('' => t('- None -'));
       $options += $this->display->handler->get_field_labels();
 
       // If there are no fields, we can't group on them.