fix: #3631439 Fix plural strings with the same singular as another string (89df3a06) · Commits · project / drupal

core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampFormatter.php

+5 −5

Changes for core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampFormatter.php: 5 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -363,11 +363,11 @@ protected function buildStates(array $path, array $conditions): array {
		protected function getRefreshIntervals(): array {
		return [
		0 => $this->t('No refresh'),
		1 => $this->t('1 second'),
		15 => $this->t('@count seconds', ['@count' => 15]),
		60 => $this->t('1 minute'),
		300 => $this->t('@count minutes', ['@count' => 5]),
		600 => $this->t('@count minutes', ['@count' => 10]),
		1 => $this->formatPlural(1, '@count second', '@count seconds'),
		15 => $this->formatPlural(15, '@count second', '@count seconds'),
		60 => $this->formatPlural(1, '@count minute', '@count minutes'),
		300 => $this->formatPlural(5, '@count minute', '@count minutes'),
		600 => $this->formatPlural(10, '@count minute', '@count minutes'),
		];
		}

core/misc/time-diff.js

+17 −9

Changes for core/misc/time-diff.js: 17 added lines, 9 removed lines.
Original line number	Diff line number	Diff line
		@@ -207,7 +207,7 @@

		if (options.strict && diff < 0) {
		return {
		formatted: Drupal.formatPlural(0, '1 second', '@count seconds'),
		formatted: Drupal.formatPlural(0, '@count second', '@count seconds'),
		value: { second: 0 },
		};
		}
		@@ -225,30 +225,38 @@
		diff %= units * duration;
		switch (interval) {
		case 'year':
		output.push(Drupal.formatPlural(units, '1 year', '@count years'));
		output.push(
		Drupal.formatPlural(units, '@count year', '@count years'),
		);
		break;
		case 'month':
		output.push(
		Drupal.formatPlural(units, '1 month', '@count months'),
		Drupal.formatPlural(units, '@count month', '@count months'),
		);
		break;
		case 'week':
		output.push(Drupal.formatPlural(units, '1 week', '@count weeks'));
		output.push(
		Drupal.formatPlural(units, '@count week', '@count weeks'),
		);
		break;
		case 'day':
		output.push(Drupal.formatPlural(units, '1 day', '@count days'));
		output.push(
		Drupal.formatPlural(units, '@count day', '@count days'),
		);
		break;
		case 'hour':
		output.push(Drupal.formatPlural(units, '1 hour', '@count hours'));
		output.push(
		Drupal.formatPlural(units, '@count hour', '@count hours'),
		);
		break;
		case 'minute':
		output.push(
		Drupal.formatPlural(units, '1 minute', '@count minutes'),
		Drupal.formatPlural(units, '@count minute', '@count minutes'),
		);
		break;
		default:
		output.push(
		Drupal.formatPlural(units, '1 second', '@count seconds'),
		Drupal.formatPlural(units, '@count second', '@count seconds'),
		);
		}
		value[interval] = units;
		@@ -268,7 +276,7 @@

		if (output.length === 0) {
		return {
		formatted: Drupal.formatPlural(0, '1 second', '@count seconds'),
		formatted: Drupal.formatPlural(0, '@count second', '@count seconds'),
		value: { second: 0 },
		};
		}

core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php

+5 −5

Changes for core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php: 5 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -99,11 +99,11 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
		'#title' => $this->t('Time increments'),
		'#default_value' => $this->getSetting('increment'),
		'#options' => [
		1 => $this->t('1 minute'),
		5 => $this->t('@count minutes', ['@count' => 5]),
		10 => $this->t('@count minutes', ['@count' => 10]),
		15 => $this->t('@count minutes', ['@count' => 15]),
		30 => $this->t('@count minutes', ['@count' => 30]),
		1 => $this->formatPlural(1, '@count minute', '@count minutes'),
		5 => $this->formatPlural(5, '@count minute', '@count minutes'),
		10 => $this->formatPlural(10, '@count minute', '@count minutes'),
		15 => $this->formatPlural(15, '@count minute', '@count minutes'),
		30 => $this->formatPlural(30, '@count minute', '@count minutes'),
		],
		];
		}

core/modules/datetime_range/src/Plugin/Field/FieldWidget/DateRangeDatelistWidget.php

+5 −5

Changes for core/modules/datetime_range/src/Plugin/Field/FieldWidget/DateRangeDatelistWidget.php: 5 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -119,11 +119,11 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
		'#title' => $this->t('Time increments'),
		'#default_value' => $this->getSetting('increment'),
		'#options' => [
		1 => $this->t('1 minute'),
		5 => $this->t('@count minutes', ['@count' => 5]),
		10 => $this->t('@count minutes', ['@count' => 10]),
		15 => $this->t('@count minutes', ['@count' => 15]),
		30 => $this->t('@count minutes', ['@count' => 30]),
		1 => $this->formatPlural(1, '@count minute', '@count minutes'),
		5 => $this->formatPlural(5, '@count minute', '@count minutes'),
		10 => $this->formatPlural(10, '@count minute', '@count minutes'),
		15 => $this->formatPlural(15, '@count minute', '@count minutes'),
		30 => $this->formatPlural(30, '@count minute', '@count minutes'),
		],
		];
		}

core/modules/views/src/Plugin/views/pager/Full.php

+2 −2

Changes for core/modules/views/src/Plugin/views/pager/Full.php: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -71,14 +71,14 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
		public function summaryTitle() {
		if (!empty($this->options['offset'])) {
		return $this->formatPlural($this->options['items_per_page'],
		'@count item, skip @skip',
		'Paged, @count item, skip @skip',
		'Paged, @count items, skip @skip',
		[
		'@count' => $this->options['items_per_page'],
		'@skip' => $this->options['offset'],
		]);
		}
		return $this->formatPlural($this->options['items_per_page'], '@count item', 'Paged, @count items', ['@count' => $this->options['items_per_page']]);
		return $this->formatPlural($this->options['items_per_page'], 'Paged, @count item', 'Paged, @count items', ['@count' => $this->options['items_per_page']]);
		}

		/**