Skip to content

Commit

Permalink
Merge pull request #1595 from enzolutions/translation-sync-0.10.1
Browse files Browse the repository at this point in the history
[translation] fix some translation strings
  • Loading branch information
enzolutions committed Dec 29, 2015
2 parents 694ac95 + e68c253 commit 110b025
Show file tree
Hide file tree
Showing 14 changed files with 81 additions and 136 deletions.
16 changes: 8 additions & 8 deletions config/translations/ca/create.nodes.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
description: 'Generate dummy content for your Drupal 8 application.'
help: 'The <info>generate:content</info> command helps you generate fake content.'
welcome: 'Welcome to the Drupal Content generator'
description: 'Create dummy nodes for your Drupal 8 application.'
help: 'The <info>create:nodes</info> command helps you generate fake terms.'
welcome: 'Welcome to the Drupal nodes generator'
arguments:
content-types: 'Content type(s) to be used content generation'
content-types: 'Content type(s) to be used in node creation'
options:
limit: 'How many nodes would you like to generate'
title-words: 'Maximum number of words in titles'
limit: 'How many nodes would you like to create'
title-words: 'Maximum number of words in node titles'
time-range: 'How far back in time should the nodes be dated'
questions:
content-type: 'Select content type(s) to be used on content generation'
content-type: 'Select content type(s) to be used on node creation'
limit: 'Enter how many nodes would you like to generate'
title-words: 'Enter the maximum number of words in titles'
time-range: 'How far back in time should the nodes be dated?'
Expand All @@ -25,4 +25,4 @@ messages:
title: 'Title'
created: 'Created Time'
invalid-content-types: 'Content types %s are invalid'
generated-content: 'Generated %s nodes successfully'
generated-content: 'Created %s nodes successfully'
26 changes: 0 additions & 26 deletions config/translations/ca/generate.content.yml

This file was deleted.

16 changes: 8 additions & 8 deletions config/translations/es/create.nodes.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
description: 'Generate dummy content for your Drupal 8 application.'
help: 'The <info>generate:content</info> command helps you generate fake content.'
welcome: 'Welcome to the Drupal Content generator'
description: 'Create dummy nodes for your Drupal 8 application.'
help: 'The <info>create:nodes</info> command helps you generate fake terms.'
welcome: 'Welcome to the Drupal nodes generator'
arguments:
content-types: 'Content type(s) to be used content generation'
content-types: 'Content type(s) to be used in node creation'
options:
limit: 'How many nodes would you like to generate'
title-words: 'Maximum number of words in titles'
limit: 'How many nodes would you like to create'
title-words: 'Maximum number of words in node titles'
time-range: 'How far back in time should the nodes be dated'
questions:
content-type: 'Select content type(s) to be used on content generation'
content-type: 'Select content type(s) to be used on node creation'
limit: 'Enter how many nodes would you like to generate'
title-words: 'Enter the maximum number of words in titles'
time-range: 'How far back in time should the nodes be dated?'
Expand All @@ -25,4 +25,4 @@ messages:
title: 'Title'
created: 'Created Time'
invalid-content-types: 'Content types %s are invalid'
generated-content: 'Generated %s nodes successfully'
generated-content: 'Created %s nodes successfully'
16 changes: 8 additions & 8 deletions config/translations/fr/create.nodes.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
description: 'Generate dummy content for your Drupal 8 application.'
help: 'The <info>generate:content</info> command helps you generate fake content.'
welcome: 'Welcome to the Drupal Content generator'
description: 'Create dummy nodes for your Drupal 8 application.'
help: 'The <info>create:nodes</info> command helps you generate fake terms.'
welcome: 'Welcome to the Drupal nodes generator'
arguments:
content-types: 'Content type(s) to be used content generation'
content-types: 'Content type(s) to be used in node creation'
options:
limit: 'How many nodes would you like to generate'
title-words: 'Maximum number of words in titles'
limit: 'How many nodes would you like to create'
title-words: 'Maximum number of words in node titles'
time-range: 'How far back in time should the nodes be dated'
questions:
content-type: 'Select content type(s) to be used on content generation'
content-type: 'Select content type(s) to be used on node creation'
limit: 'Enter how many nodes would you like to generate'
title-words: 'Enter the maximum number of words in titles'
time-range: 'How far back in time should the nodes be dated?'
Expand All @@ -25,4 +25,4 @@ messages:
title: 'Title'
created: 'Created Time'
invalid-content-types: 'Content types %s are invalid'
generated-content: 'Generated %s nodes successfully'
generated-content: 'Created %s nodes successfully'
16 changes: 8 additions & 8 deletions config/translations/hi/create.nodes.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
description: 'Generate dummy content for your Drupal 8 application.'
help: 'The <info>generate:content</info> command helps you generate fake content.'
welcome: 'Welcome to the Drupal Content generator'
description: 'Create dummy nodes for your Drupal 8 application.'
help: 'The <info>create:nodes</info> command helps you generate fake terms.'
welcome: 'Welcome to the Drupal nodes generator'
arguments:
content-types: 'Content type(s) to be used content generation'
content-types: 'Content type(s) to be used in node creation'
options:
limit: 'How many nodes would you like to generate'
title-words: 'Maximum number of words in titles'
limit: 'How many nodes would you like to create'
title-words: 'Maximum number of words in node titles'
time-range: 'How far back in time should the nodes be dated'
questions:
content-type: 'Select content type(s) to be used on content generation'
content-type: 'Select content type(s) to be used on node creation'
limit: 'Enter how many nodes would you like to generate'
title-words: 'Enter the maximum number of words in titles'
time-range: 'How far back in time should the nodes be dated?'
Expand All @@ -25,4 +25,4 @@ messages:
title: 'Title'
created: 'Created Time'
invalid-content-types: 'Content types %s are invalid'
generated-content: 'Generated %s nodes successfully'
generated-content: 'Created %s nodes successfully'
16 changes: 8 additions & 8 deletions config/translations/hu/create.nodes.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
description: 'Generate dummy content for your Drupal 8 application.'
help: 'The <info>generate:content</info> command helps you generate fake content.'
welcome: 'Welcome to the Drupal Content generator'
description: 'Create dummy nodes for your Drupal 8 application.'
help: 'The <info>create:nodes</info> command helps you generate fake terms.'
welcome: 'Welcome to the Drupal nodes generator'
arguments:
content-types: 'Content type(s) to be used content generation'
content-types: 'Content type(s) to be used in node creation'
options:
limit: 'How many nodes would you like to generate'
title-words: 'Maximum number of words in titles'
limit: 'How many nodes would you like to create'
title-words: 'Maximum number of words in node titles'
time-range: 'How far back in time should the nodes be dated'
questions:
content-type: 'Select content type(s) to be used on content generation'
content-type: 'Select content type(s) to be used on node creation'
limit: 'Enter how many nodes would you like to generate'
title-words: 'Enter the maximum number of words in titles'
time-range: 'How far back in time should the nodes be dated?'
Expand All @@ -25,4 +25,4 @@ messages:
title: 'Title'
created: 'Created Time'
invalid-content-types: 'Content types %s are invalid'
generated-content: 'Generated %s nodes successfully'
generated-content: 'Created %s nodes successfully'
16 changes: 8 additions & 8 deletions config/translations/pt_br/create.nodes.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
description: 'Generate dummy content for your Drupal 8 application.'
help: 'The <info>generate:content</info> command helps you generate fake content.'
welcome: 'Welcome to the Drupal Content generator'
description: 'Create dummy nodes for your Drupal 8 application.'
help: 'The <info>create:nodes</info> command helps you generate fake terms.'
welcome: 'Welcome to the Drupal nodes generator'
arguments:
content-types: 'Content type(s) to be used content generation'
content-types: 'Content type(s) to be used in node creation'
options:
limit: 'How many nodes would you like to generate'
title-words: 'Maximum number of words in titles'
limit: 'How many nodes would you like to create'
title-words: 'Maximum number of words in node titles'
time-range: 'How far back in time should the nodes be dated'
questions:
content-type: 'Select content type(s) to be used on content generation'
content-type: 'Select content type(s) to be used on node creation'
limit: 'Enter how many nodes would you like to generate'
title-words: 'Enter the maximum number of words in titles'
time-range: 'How far back in time should the nodes be dated?'
Expand All @@ -25,4 +25,4 @@ messages:
title: 'Title'
created: 'Created Time'
invalid-content-types: 'Content types %s are invalid'
generated-content: 'Generated %s nodes successfully'
generated-content: 'Created %s nodes successfully'
26 changes: 0 additions & 26 deletions config/translations/pt_br/generate.content.yml

This file was deleted.

16 changes: 8 additions & 8 deletions config/translations/ro/create.nodes.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
description: 'Generate dummy content for your Drupal 8 application.'
help: 'The <info>generate:content</info> command helps you generate fake content.'
welcome: 'Welcome to the Drupal Content generator'
description: 'Create dummy nodes for your Drupal 8 application.'
help: 'The <info>create:nodes</info> command helps you generate fake terms.'
welcome: 'Welcome to the Drupal nodes generator'
arguments:
content-types: 'Content type(s) to be used content generation'
content-types: 'Content type(s) to be used in node creation'
options:
limit: 'How many nodes would you like to generate'
title-words: 'Maximum number of words in titles'
limit: 'How many nodes would you like to create'
title-words: 'Maximum number of words in node titles'
time-range: 'How far back in time should the nodes be dated'
questions:
content-type: 'Select content type(s) to be used on content generation'
content-type: 'Select content type(s) to be used on node creation'
limit: 'Enter how many nodes would you like to generate'
title-words: 'Enter the maximum number of words in titles'
time-range: 'How far back in time should the nodes be dated?'
Expand All @@ -25,4 +25,4 @@ messages:
title: 'Title'
created: 'Created Time'
invalid-content-types: 'Content types %s are invalid'
generated-content: 'Generated %s nodes successfully'
generated-content: 'Created %s nodes successfully'
16 changes: 8 additions & 8 deletions config/translations/ru/create.nodes.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
description: 'Generate dummy content for your Drupal 8 application.'
help: 'The <info>generate:content</info> command helps you generate fake content.'
welcome: 'Welcome to the Drupal Content generator'
description: 'Create dummy nodes for your Drupal 8 application.'
help: 'The <info>create:nodes</info> command helps you generate fake terms.'
welcome: 'Welcome to the Drupal nodes generator'
arguments:
content-types: 'Content type(s) to be used content generation'
content-types: 'Content type(s) to be used in node creation'
options:
limit: 'How many nodes would you like to generate'
title-words: 'Maximum number of words in titles'
limit: 'How many nodes would you like to create'
title-words: 'Maximum number of words in node titles'
time-range: 'How far back in time should the nodes be dated'
questions:
content-type: 'Select content type(s) to be used on content generation'
content-type: 'Select content type(s) to be used on node creation'
limit: 'Enter how many nodes would you like to generate'
title-words: 'Enter the maximum number of words in titles'
time-range: 'How far back in time should the nodes be dated?'
Expand All @@ -25,4 +25,4 @@ messages:
title: 'Title'
created: 'Created Time'
invalid-content-types: 'Content types %s are invalid'
generated-content: 'Generated %s nodes successfully'
generated-content: 'Created %s nodes successfully'
16 changes: 8 additions & 8 deletions config/translations/vn/create.nodes.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
description: 'Generate dummy content for your Drupal 8 application.'
help: 'The <info>generate:content</info> command helps you generate fake content.'
welcome: 'Welcome to the Drupal Content generator'
description: 'Create dummy nodes for your Drupal 8 application.'
help: 'The <info>create:nodes</info> command helps you generate fake terms.'
welcome: 'Welcome to the Drupal nodes generator'
arguments:
content-types: 'Content type(s) to be used content generation'
content-types: 'Content type(s) to be used in node creation'
options:
limit: 'How many nodes would you like to generate'
title-words: 'Maximum number of words in titles'
limit: 'How many nodes would you like to create'
title-words: 'Maximum number of words in node titles'
time-range: 'How far back in time should the nodes be dated'
questions:
content-type: 'Select content type(s) to be used on content generation'
content-type: 'Select content type(s) to be used on node creation'
limit: 'Enter how many nodes would you like to generate'
title-words: 'Enter the maximum number of words in titles'
time-range: 'How far back in time should the nodes be dated?'
Expand All @@ -25,4 +25,4 @@ messages:
title: 'Title'
created: 'Created Time'
invalid-content-types: 'Content types %s are invalid'
generated-content: 'Generated %s nodes successfully'
generated-content: 'Created %s nodes successfully'
16 changes: 8 additions & 8 deletions config/translations/zh_hans/create.nodes.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
description: 'Generate dummy content for your Drupal 8 application.'
help: 'The <info>generate:content</info> command helps you generate fake content.'
welcome: 'Welcome to the Drupal Content generator'
description: 'Create dummy nodes for your Drupal 8 application.'
help: 'The <info>create:nodes</info> command helps you generate fake terms.'
welcome: 'Welcome to the Drupal nodes generator'
arguments:
content-types: 'Content type(s) to be used content generation'
content-types: 'Content type(s) to be used in node creation'
options:
limit: 'How many nodes would you like to generate'
title-words: 'Maximum number of words in titles'
limit: 'How many nodes would you like to create'
title-words: 'Maximum number of words in node titles'
time-range: 'How far back in time should the nodes be dated'
questions:
content-type: 'Select content type(s) to be used on content generation'
content-type: 'Select content type(s) to be used on node creation'
limit: 'Enter how many nodes would you like to generate'
title-words: 'Enter the maximum number of words in titles'
time-range: 'How far back in time should the nodes be dated?'
Expand All @@ -25,4 +25,4 @@ messages:
title: 'Title'
created: 'Created Time'
invalid-content-types: 'Content types %s are invalid'
generated-content: 'Generated %s nodes successfully'
generated-content: 'Created %s nodes successfully'
1 change: 0 additions & 1 deletion src/Command/User/PasswordHashCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ protected function interact(InputInterface $input, OutputInterface $output)
function ($pass) use ($passwords, $io) {
if (!empty($pass) || count($passwords) >= 1) {
if ($pass == '') {

return true;
}

Expand Down
4 changes: 1 addition & 3 deletions src/Command/User/PasswordResetCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ protected function interact(InputInterface $input, OutputInterface $output)

$user = $input->getArgument('user');
if (!$user) {

while (true) {
$user = $io->ask(
$this->trans('commands.user.password.reset.questions.user'),
Expand Down Expand Up @@ -125,8 +124,7 @@ function ($uid) use ($io) {

$password = $input->getArgument('password');
if (!$password) {

while(true) {
while (true) {
$password = $io->ask(
$this->trans('commands.user.password.hash.questions.password'),
'',
Expand Down

0 comments on commit 110b025

Please sign in to comment.