From 16482efc278b7a88e89aa08cb9dd1a79dcccd416 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 12 Feb 2020 15:34:00 +0100
Subject: [PATCH] Do not use translation-concatenation
it's as bad as the word itself sounds
Signed-off-by: Joas Schilling <coding@schilljs.com>
---
apps/accessibility/js/accessibility.js | Bin 162407 -> 162331 bytes
apps/accessibility/js/accessibility.js.map | Bin 796054 -> 795939 bytes
.../lib/AccessibilityProvider.php | 3 +++
apps/accessibility/src/Accessibility.vue | 14 ++++++++------
.../src/components/ItemPreview.vue | 2 +-
5 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/apps/accessibility/js/accessibility.js b/apps/accessibility/js/accessibility.js
index 8c3ce93396b5b197c14e765bf3fcf29f9bc12f47..52b81b0ca93c8a6e0ca4e5abbad32574e053adc0 100644
GIT binary patch
delta 197
zcmaF<g>&{7&W0AoElj-`(`D0`IJi^u5|eULeG-#WbGBc|U|P&PeL^mi3P*KLW?pt`
zUdr^M9HvTXy`t2DoW$f*4JDX(t&)zCjeeq?()3q3Ox@G><uWx%=9d;JWEK~frYe*a
zB_?O57Qqxxx6fm876(bEq!wqU=P8t=Cg#E=8}pbF@Y?VokEwn7+<d0e?QR83id+D;
C;7Gv$
delta 244
zcmbRJh4c9r&W0AoElj-`)5FV{gbiHt5|eULl{7WAl@ye;OZ4K4HA?gfic-rmQ_J;A
zGD~t&^-A)6^2<|;oD+*vH8i&`$Y5H`JiQ=?se-3gC%rT?B{e5AFSU63#C#@;=^nXE
zZX9~a`FY8SB^uKmvzdgaJLfQ|a4Bi(DB0*I+9_#H@5^Osny!_{<TSk{k12lo|2(EP
zR2|a!r9}#v#l@wm3MEB}$=RtzNV;3|nMzTWOM;ZAq!wqU=P8t=Cgvg(Z~v9gq{syT
DA(K%D
diff --git a/apps/accessibility/js/accessibility.js.map b/apps/accessibility/js/accessibility.js.map
index aa1c9e204fed2542debdf1c2577aa9b1b0727840..70e6fb40acfa9a14746db2b43b7a01de9ab5c135 100644
GIT binary patch
delta 844
zcmZ{i&ubGw6vs(BO}1ueZ4xTQ9|Rgm>yG)+l%!P=-)_=aw3JfY*y6!Sx(%C6lbEEf
zAl8FI6)$3`g9kzIP{E6$u$R_@M>XPKpeF?ng2#eTeG^ORrHAih-}k-unK#2e{up`w
zA@XXQw+<$9Yk&9#8I19vwP-f@rjdPHa2q9_EgF}2)+pXtX{@d^9H<t1rP2CjR{RYR
zr!v868t8RXh&~c<sYzfdJtp4wk=M5)8JGYzsDlnHu0aZz0mB-w45%3M7o=lpP{48q
zER2(~Gp_+c@?&rjV^TW%38n_IW<Q!NlHP?j9aXlDKw5H;ykP(6Cq73<VuT|eI2#2R
zofhwU2^Zr5qS!T+bUWHJa(}34SH!~rQN<P`%r(O}4h)OmjQErP6J$bWmZgwU8PH@l
znU85K2au~2lPnF8W;%e*#<8+&C7Ydmmz@=tPmy)i!T~Ig*AE;p<a>ar%?n?MtoN32
zU<_dF#(@K-_!J_lqbjyT<a~d*kdo(GTBWYBGLoj`Ya&l3dP2XBHr9Dn@Gv<UHN$do
zeMBxki9sLMqLn0@!kfx$dKnYk2R|hyJriBs3=>ov%87EJ6jVFvki8jpzxb>SMB}-5
zY%XgTcidN7y_Kr5WE#t%egBc|Y@uhIg0)d)|L<i#P-wRzzIM@oa<gcbETc3ho*kx-
z#Az?>?Amp11(`p1Hq6fjh1x}*I<AS1PTC`SJ@kH0d9ms@YqdqgU$63<WmNYtFFjO0
zBFl3|&CHklb%QVL6@Pi?-Gk03c<B=n_0fCwcOU(!C~-a%n@_}t1m5nL*f>s)if=n^
LukAlUmt6k<7*Pf-
delta 856
zcmaJ;OHUI~6i($zTe!+o5)+h3t!c-(^f5eIgCU-o7E*yA@+c4pnJJSx^l4`RDIqRc
z5LZMA+_09!$HHhd856gzAT@E}kI<bv6BFZ|7I*04JNLZ4@1A?^v*XagN$AZ_rA}0}
zy<f_66cMB9URd?LtElf+ws$K#yA=n+Icv94SDB};1k{X^07;SnNM!UlognBEy>J~h
zTpR-!dzh2Sx&(4LOIQ5J>+FvKiOXfW??-R-{wbIM(l0|Chz1b}ND`vVZj9QQj0E>(
zJEb!_3CyG=VDxALMwlP7Gc~R*LAlx)vYSR~a(&edYar=6)<+&)bu{%1DNGKO>a2oD
zPp%=AE_#v6x+|a#hkKeB5`ZDi&;mh8XObwaIYKK0ah_Vh=78iZiL<vBMahmP1$L$Y
zQhD0cjV`<APBrFfxEt-e^&W|g1B{ny)s+1z(4}Si!>;C7)!x!twdzRImjNU=iu7v$
z-EPRO#O;eRQl54NQHQ%=N_MOi>0l7u2&aQFG7Rz%k=YQ;$Ty{OF-E5CzhKeKDht?U
z%(eG6JXhX13?hc}4D}371{Z^yp}{%~Hoo}miYSpju~*Zq#P7z1x<S+LQ&K6-FmzSV
z>gI-zaK3n6QL~zl=eD-E%}uUY($;isJz(l)RtuPg(Zae`k`+Vq^VSCk9;m0Ex^Vlz
zUluPcc(?_Ru(Xy7EE#_L_>Th5FY=4@iw6%|_gwhcNfXWZ33asKgAVWJS;NuJX6&u^
z@msfo3O#7SM|7$cOZ0Us-lnr{_-Xgqw8CnM(+y))<IIwh%4nrig>P;6vG8xovS#S%
hJZEZ3u12sPwBzqCSEyH1m2gy~Y>S=NqbvBx`3GS03i1E|
diff --git a/apps/accessibility/lib/AccessibilityProvider.php b/apps/accessibility/lib/AccessibilityProvider.php
index abb7a95afa2..ce9489df5f2 100644
--- a/apps/accessibility/lib/AccessibilityProvider.php
+++ b/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.')
]
);
diff --git a/apps/accessibility/src/Accessibility.vue b/apps/accessibility/src/Accessibility.vue
index 63cfec20c94..b717f4cf9f9 100644
--- a/apps/accessibility/src/Accessibility.vue
+++ b/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: {
diff --git a/apps/accessibility/src/components/ItemPreview.vue b/apps/accessibility/src/components/ItemPreview.vue
index 9c74eb03fd1..1b6f3ebf01d 100644
--- a/apps/accessibility/src/components/ItemPreview.vue
+++ b/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>
--
GitLab