fix(l10n): Improve english source strings #51049
Conversation
- No leading/trailing whitespace - Use asci single quote Signed-off-by: Joas Schilling <[email protected]>
nickvergessen
added
bug
3. to review
|
/compile / |
|
/backport 095ab44 to stable31 |
|
/backport 095ab44 to stable30 |
|
/backport 095ab44 to stable29 |
Signed-off-by: nextcloud-command <[email protected]>
| <div class="notCreatable notPublic hidden"> | ||
| <div class="icon-alert-outline"></div> | ||
| <?php p($l->t('You do not have permission to upload or create files here'))?> | ||
| <?php p($l->t('You don\'t have permission to upload or create files here.'))?> |
There was a problem hiding this comment.
Do we have some guidelines on do not vs don't?
Because in examples like this you want to emphasize the importance of the issue which from the tone do not fulfills better than don't.
There was a problem hiding this comment.
We had a talk about missing guidelines yesterday 😄 .
Since years we (specially user Valdnet) make changes to only use "don't" and this is the current state and standard.
There was a problem hiding this comment.
@susnux I told you the wrong things. It's the other way around. 🤷
Next PR will come
| @$this->invokeLDAPMethod('modReplace', $userDN, $password); | ||
| } catch (ConstraintViolationException $e) { | ||
| throw new HintException('Password change rejected.', Util::getL10N('user_ldap')->t('Password change rejected. Hint: ') . $e->getMessage(), (int)$e->getCode()); | ||
| throw new HintException('Password change rejected.', Util::getL10N('user_ldap')->t('Password change rejected. Hint: %s', $e->getMessage()), (int)$e->getCode()); |
There was a problem hiding this comment.
Does this work? Should the parameters not be an array?
| throw new HintException('Password change rejected.', Util::getL10N('user_ldap')->t('Password change rejected. Hint: %s', $e->getMessage()), (int)$e->getCode()); | |
| throw new HintException('Password change rejected.', Util::getL10N('user_ldap')->t('Password change rejected. Hint: %s', [$e->getMessage()]), (int)$e->getCode()); |
There was a problem hiding this comment.
Both work:
Line 23 in af6de04
for the sake of already triggered backport bot and compiled JS I'd merge it for now
|
The backport to # Switch to the target branch and update it
git checkout stable29
git pull origin stable29
# Create the new backport branch
git checkout -b backport/51049/stable29
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 095ab441
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/51049/stable29Error: No changes found in backport branch Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
Checklist