Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2293779 by pcambra, joshi.rohit100: Fixed Old t() method in language module forms.

8.0.x
webchick 2014-08-24 13:23:57 -07:00
parent 2e992d564e
commit 4ed1db5b54
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/language/src/Form/NegotiationSelectedForm.php
View File

@ -30,7 +30,7 @@ class NegotiationSelectedForm extends ConfigFormBase {
$config = $this->config('language.negotiation'); $config = $this->config('language.negotiation');
$form['selected_langcode'] = array( $form['selected_langcode'] = array(
'#type' => 'language_select', '#type' => 'language_select',
'#title' => t('Language'), '#title' => $this->t('Language'),
'#languages' => LanguageInterface::STATE_CONFIGURABLE | LanguageInterface::STATE_SITE_DEFAULT, '#languages' => LanguageInterface::STATE_CONFIGURABLE | LanguageInterface::STATE_SITE_DEFAULT,
'#default_value' => $config->get('selected_langcode'), '#default_value' => $config->get('selected_langcode'),
); );

4
core/modules/language/src/Form/NegotiationSessionForm.php
View File

@ -28,10 +28,10 @@ class NegotiationSessionForm extends ConfigFormBase {
public function buildForm(array $form, FormStateInterface $form_state) { public function buildForm(array $form, FormStateInterface $form_state) {
$config = $this->config('language.negotiation'); $config = $this->config('language.negotiation');
$form['language_negotiation_session_param'] = array( $form['language_negotiation_session_param'] = array(
'#title' => t('Request/session parameter'), '#title' => $this->t('Request/session parameter'),
'#type' => 'textfield', '#type' => 'textfield',
'#default_value' => $config->get('session.parameter'), '#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'); $form_state->setRedirect('language.negotiation');

30
core/modules/language/src/Form/NegotiationUrlForm.php
View File

@ -31,11 +31,11 @@ class NegotiationUrlForm extends ConfigFormBase {
$config = $this->config('language.negotiation'); $config = $this->config('language.negotiation');
$form['language_negotiation_url_part'] = array( $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', '#type' => 'radios',
'#options' => array( '#options' => array(
LanguageNegotiationUrl::CONFIG_PATH_PREFIX => t('Path prefix'), LanguageNegotiationUrl::CONFIG_PATH_PREFIX => $this->t('Path prefix'),
LanguageNegotiationUrl::CONFIG_DOMAIN => t('Domain'), LanguageNegotiationUrl::CONFIG_DOMAIN => $this->t('Domain'),
), ),
'#default_value' => $config->get('url.source'), '#default_value' => $config->get('url.source'),
); );
@ -43,9 +43,9 @@ class NegotiationUrlForm extends ConfigFormBase {
$form['prefix'] = array( $form['prefix'] = array(
'#type' => 'details', '#type' => 'details',
'#tree' => TRUE, '#tree' => TRUE,
'#title' => t('Path prefix configuration'), '#title' => $this->t('Path prefix configuration'),
'#open' => TRUE, '#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. <strong>Modifying this value may break existing URLs. Use with caution in a production environment.</strong> 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. <strong>Modifying this value may break existing URLs. Use with caution in a production environment.</strong> Example: Specifying "deutsch" as the path prefix code for German results in URLs like "example.com/deutsch/contact".'),
'#states' => array( '#states' => array(
'visible' => array( 'visible' => array(
':input[name="language_negotiation_url_part"]' => array( ':input[name="language_negotiation_url_part"]' => array(
@ -57,9 +57,9 @@ class NegotiationUrlForm extends ConfigFormBase {
$form['domain'] = array( $form['domain'] = array(
'#type' => 'details', '#type' => 'details',
'#tree' => TRUE, '#tree' => TRUE,
'#title' => t('Domain configuration'), '#title' => $this->t('Domain configuration'),
'#open' => TRUE, '#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.<strong>Modifying this value may break existing URLs. Use with caution in a production environment.</strong> 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.<strong>Modifying this value may break existing URLs. Use with caution in a production environment.</strong> Example: Specifying "de.example.com" as language domain for German will result in an URL like "http://de.example.com/contact".'),
'#states' => array( '#states' => array(
'visible' => array( 'visible' => array(
':input[name="language_negotiation_url_part"]' => 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); $t_args = array('%language' => $language->name, '%langcode' => $language->id);
$form['prefix'][$langcode] = array( $form['prefix'][$langcode] = array(
'#type' => 'textfield', '#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, '#maxlength' => 64,
'#default_value' => isset($prefixes[$langcode]) ? $prefixes[$langcode] : '', '#default_value' => isset($prefixes[$langcode]) ? $prefixes[$langcode] : '',
'#field_prefix' => $base_url . '/', '#field_prefix' => $base_url . '/',
); );
$form['domain'][$langcode] = array( $form['domain'][$langcode] = array(
'#type' => 'textfield', '#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, '#maxlength' => 128,
'#default_value' => isset($domains[$langcode]) ? $domains[$langcode] : '', '#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) { 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, // Throw a form error if the prefix is blank for a non-default language,
// although it is required for selected negotiation type. // 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) { elseif (strpos($value, '/') !== FALSE) {
// Throw a form error if the string contains a slash, // Throw a form error if the string contains a slash,
// which would not work. // 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) { elseif (isset($count[$value]) && $count[$value] > 1) {
// Throw a form error if there are two languages with the same // Throw a form error if there are two languages with the same
// domain/prefix. // 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) { 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, // Throw a form error if the domain is blank for a non-default language,
// although it is required for selected negotiation type. // 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) { elseif (isset($count[$value]) && $count[$value] > 1) {
// Throw a form error if there are two languages with the same // Throw a form error if there are two languages with the same
// domain/domain. // 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. // Ensure we have exactly one protocol when checking the hostname.
$host = 'http://' . str_replace(array('http://', 'https://'), '', $value); $host = 'http://' . str_replace(array('http://', 'https://'), '', $value);
if (parse_url($host, PHP_URL_HOST) != $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)));
} }
} }
} }