Merge pull request #19437 from nextcloud/bugfix/noid/translation-concatenation-is-bad

Do not use translation-concatenation

apps/accessibility/lib/AccessibilityProvider.php

@@ -62,6 +62,7 @@ class AccessibilityProvider {
 				'id'    => 'dark',
 				'img'   => $this->urlGenerator->imagePath($this->appName, 'theme-dark.jpg'),
 				'title' => $this->l->t('Dark theme'),
+				'enableLabel' => $this->l->t('Enable dark theme'),
 				'text'  => $this->l->t('A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find.')
 			]
 		);
@@ -72,6 +73,7 @@ class AccessibilityProvider {
 				'id'    => 'highcontrast',
 				'img'   => $this->urlGenerator->imagePath($this->appName, 'mode-highcontrast.jpg'),
 				'title' => $this->l->t('High contrast mode'),
+				'enableLabel' => $this->l->t('Enable high contrast mode'),
 				'text'  => $this->l->t('A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased.')
 			];
 	}
@@ -82,6 +84,7 @@ class AccessibilityProvider {
 				'id'    => 'fontdyslexic',
 				'img'   => $this->urlGenerator->imagePath($this->appName, 'font-opendyslexic.jpg'),
 				'title' => $this->l->t('Dyslexia font'),
+				'enableLabel' => $this->l->t('Enable dyslexia font'),
 				'text'  => $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia.')
 			]
 		);

apps/accessibility/src/Accessibility.vue

@@ -65,28 +65,30 @@ export default {
 				`Universal access is very important to us. We follow web standards
 				and check to make everything usable also without mouse,
 				and assistive software such as screenreaders.
-				We aim to be compliant with the {guidelines} 2.1 on AA level,
+				We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level,
 				with the high contrast theme even on AAA level.`
 			)
 				.replace('{guidelines}', this.guidelinesLink)
+				.replace('{linkend}', '</a>')
 		},
 		guidelinesLink() {
-			return `<a target="_blank" href="https://www.w3.org/WAI/standards-guidelines/wcag/" rel="noreferrer nofollow">${t('accessibility', 'Web Content Accessibility Guidelines')}</a>`
+			return `<a target="_blank" href="https://www.w3.org/WAI/standards-guidelines/wcag/" rel="noreferrer nofollow">`
 		},
 		descriptionDetail() {
 			return t(
 				'accessibility',
-				`If you find any issues, don’t hesitate to report them on {issuetracker}.
-				And if you want to get involved, come join {designteam}!`
+				`If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}.
+				And if you want to get involved, come join {designteam}our design team{linkend}!`
 			)
 				.replace('{issuetracker}', this.issuetrackerLink)
 				.replace('{designteam}', this.designteamLink)
+				.replace('{linkend}', '</a>')
 		},
 		issuetrackerLink() {
-			return `<a target="_blank" href="https://github.com/nextcloud/server/issues/" rel="noreferrer nofollow">${t('accessibility', 'our issue tracker')}</a>`
+			return `<a target="_blank" href="https://github.com/nextcloud/server/issues/" rel="noreferrer nofollow">`
 		},
 		designteamLink() {
-			return `<a target="_blank" href="https://nextcloud.com/design" rel="noreferrer nofollow">${t('accessibility', 'our design team')}</a>`
+			return `<a target="_blank" href="https://nextcloud.com/design" rel="noreferrer nofollow">`
 		},
 	},
 	methods: {

apps/accessibility/src/components/ItemPreview.vue

@@ -8,7 +8,7 @@
 				v-model="checked"
 				type="checkbox"
 				class="checkbox">
-			<label :for="'accessibility-' + preview.id">{{ t('accessibility', 'Enable') }} {{ preview.title.toLowerCase() }}</label>
+			<label :for="'accessibility-' + preview.id">{{ preview.enableLabel }}</label>
 		</div>
 	</div>
 </template>