Skip to content

fix(i18n): translation guidelines incremental code update batch [experiment - do not merge yet] #62734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
joshtrichards wants to merge 5 commits into
base: master
Choose a base branch
from
+5 −3
Draft

fix(i18n): translation guidelines incremental code update batch [experiment - do not merge yet] #62734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3033152
fix(settings): Untranslated runtime error in UserList.vue
joshtrichards Jul 31, 2026
a19cf08
fix(settings): [i18n] avoid concatenation in generic request errors
joshtrichards Jul 31, 2026
431a0a6
fix(settings): [i18n] add translator context to placeholder in GroupS…
joshtrichards Jul 31, 2026
7de9822
chore(settings): [i18n] correct translator context placement in Group…
joshtrichards Jul 31, 2026
16b1092
fix(SetupChecks): [i18n] positional placeholder and translator note
joshtrichards Jul 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/settings/lib/SetupChecks/AppDirsWithDifferentOwner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,9 @@
$currentUserInfos = posix_getpwuid($currentUser) ?: [];
$appDirsWithDifferentOwner = $this->getAppDirsWithDifferentOwner($currentUser);
if (count($appDirsWithDifferentOwner) > 0) {
// TRANSLATORS %1$s is a newline-separated list of absolute app-directory paths.
return SetupResult::warning(
$this->l10n->t("Some app directories are owned by a different user than the web server one. This may be the case if apps have been installed manually. Check the permissions of the following app directories:\n%s", implode("\n", $appDirsWithDifferentOwner))
$this->l10n->t("Some app directories are owned by a different user than the web server one. This may be the case if apps have been installed manually. Check the permissions of the following app directories:\n%1$s", [implode("\n", $appDirsWithDifferentOwner)])

Check failure on line 86 in apps/settings/lib/SetupChecks/AppDirsWithDifferentOwner.php

View workflow job for this annotation

GitHub Actions / static-code-analysis

UndefinedVariable 

apps/settings/lib/SetupChecks/AppDirsWithDifferentOwner.php:86:215: UndefinedVariable: Cannot find referenced variable $s (see https://psalm.dev/024)
);
} else {
return SetupResult::success($this->l10n->t('App directories have the correct owner "%s"', [$currentUserInfos['name'] ?? '']));
Expand Down
1 change: 1 addition & 0 deletions apps/settings/src/components/AdminDelegation/GroupSelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
- SPDX-License-Identifier: AGPL-3.0-or-later
-->
<template>
<!-- TRANSLATORS Placeholder shown when no groups are selected. -->
<NcSelect
v-model="selected"
:input-id="setting.id"
Expand Down
2 changes: 1 addition & 1 deletion apps/settings/src/components/UserList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ export default {
logger.debug(`${this.users.length} total user(s) loaded`)
} catch (error) {
logger.error('Failed to load accounts', { error })
showError('Failed to load accounts')
showError(t('settings', 'Failed to load accounts'))
}
this.loading.users = false
},
Expand Down
2 changes: 1 addition & 1 deletion apps/settings/src/store/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const mutations = {
API_FAILURE(state, error) {
try {
const message = error.error.response.data.ocs.meta.message
showError(t('settings', 'An error occurred during the request. Unable to proceed.') + '<br>' + message, { isHTML: true })
showError(t('settings', 'An error occurred during the request. Unable to proceed. {message}', { message }))
} catch {
showError(t('settings', 'An error occurred during the request. Unable to proceed.'))
}
Expand Down
Loading