Commit a06421e8 authored by webchick's avatar webchick
Browse files

Issue #1317884 by reglogge, kathyh, izus, YesCT, smiletrl: Fixed Remove all...

Issue #1317884 by reglogge, kathyh, izus, YesCT, smiletrl: Fixed Remove all instances of <none>, <Hidden> and <br/> from translatable strings because they lead to import errors.
parent 00722024
...@@ -128,7 +128,7 @@ function block_update_8003() { ...@@ -128,7 +128,7 @@ function block_update_8003() {
'length' => 255, 'length' => 255,
'not null' => TRUE, 'not null' => TRUE,
'default' => '', 'default' => '',
'description' => 'Custom title for the block. (Empty string will use block default title, <none> will remove the title, text will cause block to use specified title.)', 'description' => 'Custom title for the block. (Empty string will use block default title, - None - will remove the title, text will cause block to use specified title.)',
'translatable' => TRUE, 'translatable' => TRUE,
) )
); );
......
...@@ -558,7 +558,7 @@ function image_image_style_load($styles) { ...@@ -558,7 +558,7 @@ function image_image_style_load($styles) {
* Gets an array of image styles suitable for using as select list options. * Gets an array of image styles suitable for using as select list options.
* *
* @param $include_empty * @param $include_empty
* If TRUE a <none> option will be inserted in the options array. * If TRUE a '- None -' option will be inserted in the options array.
* @return * @return
* Array of image styles both key and value are set to style name. * Array of image styles both key and value are set to style name.
*/ */
...@@ -566,7 +566,7 @@ function image_style_options($include_empty = TRUE) { ...@@ -566,7 +566,7 @@ function image_style_options($include_empty = TRUE) {
$styles = entity_load_multiple('image_style'); $styles = entity_load_multiple('image_style');
$options = array(); $options = array();
if ($include_empty && !empty($styles)) { if ($include_empty && !empty($styles)) {
$options[''] = t('<none>'); $options[''] = t('- None -');
} }
foreach ($styles as $name => $style) { foreach ($styles as $name => $style) {
$options[$name] = $style->label(); $options[$name] = $style->label();
......
...@@ -183,7 +183,7 @@ function locale_translate_filter_form($form, &$form_state) { ...@@ -183,7 +183,7 @@ function locale_translate_filter_form($form, &$form_state) {
); );
} }
else { else {
$empty_option = isset($filter['options'][$filter['default']]) ? $filter['options'][$filter['default']] : '<none>'; $empty_option = isset($filter['options'][$filter['default']]) ? $filter['options'][$filter['default']] : '- None -';
$form['filters']['status'][$key] = array( $form['filters']['status'][$key] = array(
'#title' => $filter['title'], '#title' => $filter['title'],
'#type' => 'select', '#type' => 'select',
...@@ -257,7 +257,7 @@ function locale_translate_edit_form($form, &$form_state) { ...@@ -257,7 +257,7 @@ function locale_translate_edit_form($form, &$form_state) {
drupal_static_reset('language_list'); drupal_static_reset('language_list');
$languages = language_list(); $languages = language_list();
$langname = isset($langcode) ? $languages[$langcode]->name : "<none>"; $langname = isset($langcode) ? $languages[$langcode]->name : "- None -";
$path = drupal_get_path('module', 'locale'); $path = drupal_get_path('module', 'locale');
$form['#attached']['css'] = array( $form['#attached']['css'] = array(
......
...@@ -22,7 +22,7 @@ abstract class DefaultNumberFormatter extends FormatterBase { ...@@ -22,7 +22,7 @@ abstract class DefaultNumberFormatter extends FormatterBase {
*/ */
public function settingsForm(array $form, array &$form_state) { public function settingsForm(array $form, array &$form_state) {
$options = array( $options = array(
'' => t('<none>'), '' => t('- None -'),
'.' => t('Decimal point'), '.' => t('Decimal point'),
',' => t('Comma'), ',' => t('Comma'),
' ' => t('Space'), ' ' => t('Space'),
......
...@@ -87,7 +87,7 @@ private function submitForm($values, $valid_input) { ...@@ -87,7 +87,7 @@ private function submitForm($values, $valid_input) {
'%values' => print_r($values, TRUE), '%values' => print_r($values, TRUE),
'%errors' => $valid_form ? t('None') : implode(' ', $errors), '%errors' => $valid_form ? t('None') : implode(' ', $errors),
); );
$this->assertTrue($valid_input == $valid_form, format_string('Input values: %values<br/>Validation handler errors: %errors', $args)); $this->assertTrue($valid_input == $valid_form, format_string('Input values: %values<br />Validation handler errors: %errors', $args));
// We check submitted values only if we have a valid input. // We check submitted values only if we have a valid input.
if ($valid_input) { if ($valid_input) {
......
...@@ -91,7 +91,7 @@ function _batch_test_finished_helper($batch_id, $success, $results, $operations) ...@@ -91,7 +91,7 @@ function _batch_test_finished_helper($batch_id, $success, $results, $operations)
if (!$success) { if (!$success) {
// A fatal error occurred during the processing. // A fatal error occurred during the processing.
$error_operation = reset($operations); $error_operation = reset($operations);
$messages[] = t('An error occurred while processing @op with arguments:<br/>@args', array('@op' => $error_operation[0], '@args' => print_r($error_operation[1], TRUE))); $messages[] = t('An error occurred while processing @op with arguments:<br />@args', array('@op' => $error_operation[0], '@args' => print_r($error_operation[1], TRUE)));
} }
drupal_set_message(implode('<br />', $messages)); drupal_set_message(implode('<br />', $messages));
......
...@@ -122,7 +122,7 @@ public function buildOptionsForm(&$form, &$form_state) { ...@@ -122,7 +122,7 @@ public function buildOptionsForm(&$form, &$form_state) {
// WIP: This stuff doens't work yet: namespacing issues. // WIP: This stuff doens't work yet: namespacing issues.
// A list of suitable views to pick one as the subview. // A list of suitable views to pick one as the subview.
$views = array('' => '<none>'); $views = array('' => '- None -');
$all_views = views_get_all_views(); $all_views = views_get_all_views();
foreach ($all_views as $view) { foreach ($all_views as $view) {
// Only get views that are suitable: // Only get views that are suitable:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment