From 4ed1db5b546b1a8c73c84c61547fb6f86fe45ece Mon Sep 17 00:00:00 2001 From: webchick Date: Sun, 24 Aug 2014 13:23:57 -0700 Subject: [PATCH] Issue #2293779 by pcambra, joshi.rohit100: Fixed Old t() method in language module forms. --- .../src/Form/NegotiationSelectedForm.php | 2 +- .../src/Form/NegotiationSessionForm.php | 4 +-- .../language/src/Form/NegotiationUrlForm.php | 30 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/core/modules/language/src/Form/NegotiationSelectedForm.php b/core/modules/language/src/Form/NegotiationSelectedForm.php index a0b7df4a1dda..5b5d5a978371 100644 --- a/core/modules/language/src/Form/NegotiationSelectedForm.php +++ b/core/modules/language/src/Form/NegotiationSelectedForm.php @@ -30,7 +30,7 @@ class NegotiationSelectedForm extends ConfigFormBase { $config = $this->config('language.negotiation'); $form['selected_langcode'] = array( '#type' => 'language_select', - '#title' => t('Language'), + '#title' => $this->t('Language'), '#languages' => LanguageInterface::STATE_CONFIGURABLE | LanguageInterface::STATE_SITE_DEFAULT, '#default_value' => $config->get('selected_langcode'), ); diff --git a/core/modules/language/src/Form/NegotiationSessionForm.php b/core/modules/language/src/Form/NegotiationSessionForm.php index d506a557d382..ce9710700644 100644 --- a/core/modules/language/src/Form/NegotiationSessionForm.php +++ b/core/modules/language/src/Form/NegotiationSessionForm.php @@ -28,10 +28,10 @@ class NegotiationSessionForm extends ConfigFormBase { public function buildForm(array $form, FormStateInterface $form_state) { $config = $this->config('language.negotiation'); $form['language_negotiation_session_param'] = array( - '#title' => t('Request/session parameter'), + '#title' => $this->t('Request/session parameter'), '#type' => 'textfield', '#default_value' => $config->get('session.parameter'), - '#description' => t('Name of the request/session parameter used to determine the desired language.'), + '#description' => $this->t('Name of the request/session parameter used to determine the desired language.'), ); $form_state->setRedirect('language.negotiation'); diff --git a/core/modules/language/src/Form/NegotiationUrlForm.php b/core/modules/language/src/Form/NegotiationUrlForm.php index 7f7cf58c1e3e..e2e241ef1983 100644 --- a/core/modules/language/src/Form/NegotiationUrlForm.php +++ b/core/modules/language/src/Form/NegotiationUrlForm.php @@ -31,11 +31,11 @@ class NegotiationUrlForm extends ConfigFormBase { $config = $this->config('language.negotiation'); $form['language_negotiation_url_part'] = array( - '#title' => t('Part of the URL that determines language'), + '#title' => $this->t('Part of the URL that determines language'), '#type' => 'radios', '#options' => array( - LanguageNegotiationUrl::CONFIG_PATH_PREFIX => t('Path prefix'), - LanguageNegotiationUrl::CONFIG_DOMAIN => t('Domain'), + LanguageNegotiationUrl::CONFIG_PATH_PREFIX => $this->t('Path prefix'), + LanguageNegotiationUrl::CONFIG_DOMAIN => $this->t('Domain'), ), '#default_value' => $config->get('url.source'), ); @@ -43,9 +43,9 @@ class NegotiationUrlForm extends ConfigFormBase { $form['prefix'] = array( '#type' => 'details', '#tree' => TRUE, - '#title' => t('Path prefix configuration'), + '#title' => $this->t('Path prefix configuration'), '#open' => TRUE, - '#description' => t('Language codes or other custom text to use as a path prefix for URL language detection. For the default language, this value may be left blank. Modifying this value may break existing URLs. Use with caution in a production environment. Example: Specifying "deutsch" as the path prefix code for German results in URLs like "example.com/deutsch/contact".'), + '#description' => $this->t('Language codes or other custom text to use as a path prefix for URL language detection. For the default language, this value may be left blank. Modifying this value may break existing URLs. Use with caution in a production environment. Example: Specifying "deutsch" as the path prefix code for German results in URLs like "example.com/deutsch/contact".'), '#states' => array( 'visible' => array( ':input[name="language_negotiation_url_part"]' => array( @@ -57,9 +57,9 @@ class NegotiationUrlForm extends ConfigFormBase { $form['domain'] = array( '#type' => 'details', '#tree' => TRUE, - '#title' => t('Domain configuration'), + '#title' => $this->t('Domain configuration'), '#open' => TRUE, - '#description' => t('The domain names to use for these languages. Leave blank for the default language. Use with caution in a production environment.Modifying this value may break existing URLs. Use with caution in a production environment. Example: Specifying "de.example.com" as language domain for German will result in an URL like "http://de.example.com/contact".'), + '#description' => $this->t('The domain names to use for these languages. Leave blank for the default language. Use with caution in a production environment.Modifying this value may break existing URLs. Use with caution in a production environment. Example: Specifying "de.example.com" as language domain for German will result in an URL like "http://de.example.com/contact".'), '#states' => array( 'visible' => array( ':input[name="language_negotiation_url_part"]' => array( @@ -76,14 +76,14 @@ class NegotiationUrlForm extends ConfigFormBase { $t_args = array('%language' => $language->name, '%langcode' => $language->id); $form['prefix'][$langcode] = array( '#type' => 'textfield', - '#title' => $language->default ? t('%language (%langcode) path prefix (Default language)', $t_args) : t('%language (%langcode) path prefix', $t_args), + '#title' => $language->default ? $this->t('%language (%langcode) path prefix (Default language)', $t_args) : $this->t('%language (%langcode) path prefix', $t_args), '#maxlength' => 64, '#default_value' => isset($prefixes[$langcode]) ? $prefixes[$langcode] : '', '#field_prefix' => $base_url . '/', ); $form['domain'][$langcode] = array( '#type' => 'textfield', - '#title' => t('%language (%langcode) domain', array('%language' => $language->name, '%langcode' => $language->id)), + '#title' => $this->t('%language (%langcode) domain', array('%language' => $language->name, '%langcode' => $language->id)), '#maxlength' => 128, '#default_value' => isset($domains[$langcode]) ? $domains[$langcode] : '', ); @@ -109,18 +109,18 @@ class NegotiationUrlForm extends ConfigFormBase { if (!$language->default && $form_state->getValue('language_negotiation_url_part') == LanguageNegotiationUrl::CONFIG_PATH_PREFIX) { // Throw a form error if the prefix is blank for a non-default language, // although it is required for selected negotiation type. - $form_state->setErrorByName("prefix][$langcode", t('The prefix may only be left blank for the default language.')); + $form_state->setErrorByName("prefix][$langcode", $this->t('The prefix may only be left blank for the default language.')); } } elseif (strpos($value, '/') !== FALSE) { // Throw a form error if the string contains a slash, // which would not work. - $form_state->setErrorByName("prefix][$langcode", t('The prefix may not contain a slash.')); + $form_state->setErrorByName("prefix][$langcode", $this->t('The prefix may not contain a slash.')); } elseif (isset($count[$value]) && $count[$value] > 1) { // Throw a form error if there are two languages with the same // domain/prefix. - $form_state->setErrorByName("prefix][$langcode", t('The prefix for %language, %value, is not unique.', array('%language' => $language->name, '%value' => $value))); + $form_state->setErrorByName("prefix][$langcode", $this->t('The prefix for %language, %value, is not unique.', array('%language' => $language->name, '%value' => $value))); } } @@ -133,13 +133,13 @@ class NegotiationUrlForm extends ConfigFormBase { if (!$language->default && $form_state->getValue('language_negotiation_url_part') == LanguageNegotiationUrl::CONFIG_DOMAIN) { // Throw a form error if the domain is blank for a non-default language, // although it is required for selected negotiation type. - $form_state->setErrorByName("domain][$langcode", t('The domain may only be left blank for the default language.')); + $form_state->setErrorByName("domain][$langcode", $this->t('The domain may only be left blank for the default language.')); } } elseif (isset($count[$value]) && $count[$value] > 1) { // Throw a form error if there are two languages with the same // domain/domain. - $form_state->setErrorByName("domain][$langcode", t('The domain for %language, %value, is not unique.', array('%language' => $language->name, '%value' => $value))); + $form_state->setErrorByName("domain][$langcode", $this->t('The domain for %language, %value, is not unique.', array('%language' => $language->name, '%value' => $value))); } } @@ -150,7 +150,7 @@ class NegotiationUrlForm extends ConfigFormBase { // Ensure we have exactly one protocol when checking the hostname. $host = 'http://' . str_replace(array('http://', 'https://'), '', $value); if (parse_url($host, PHP_URL_HOST) != $value) { - $form_state->setErrorByName("domain][$langcode", t('The domain for %language may only contain the domain name, not a protocol and/or port.', array('%language' => $name))); + $form_state->setErrorByName("domain][$langcode", $this->t('The domain for %language may only contain the domain name, not a protocol and/or port.', array('%language' => $name))); } } }