Skip to content
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

Jump to bottom

Fix l10n process #3014

Merged
merged 2 commits into from
Feb 12, 2020
Merged

Fix l10n process #3014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f6d518
Fix passing $gettext to pendingShare action
Feb 12, 2020
334ac1a
Don't skip errors in l10n up/download
Feb 12, 2020
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
20 changes: 10 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,19 @@ run:

.PHONY: l10n-push
l10n-push:
cd l10n && tx -d push -s --skip --no-interactive
cd apps/files/l10n && tx -d push -s --skip --no-interactive
cd apps/markdown-editor/l10n && tx -d push -s --skip --no-interactive
cd apps/pdf-viewer/l10n && tx -d push -s --skip --no-interactive
cd apps/media-viewer/l10n && tx -d push -s --skip --no-interactive
cd l10n && tx -d push -s --no-interactive
cd apps/files/l10n && tx -d push -s --no-interactive
cd apps/markdown-editor/l10n && tx -d push -s --no-interactive
cd apps/pdf-viewer/l10n && tx -d push -s --no-interactive
cd apps/media-viewer/l10n && tx -d push -s --no-interactive

.PHONY: l10n-pull
l10n-pull:
cd l10n && tx -d pull -a --skip
cd apps/files/l10n && tx -d pull -a --skip
cd apps/markdown-editor/l10n && tx -d pull -a --skip
cd apps/pdf-viewer/l10n && tx -d pull -a --skip
cd apps/media-viewer/l10n && tx -d pull -a --skip
cd l10n && tx -d pull -a
cd apps/files/l10n && tx -d pull -a
cd apps/markdown-editor/l10n && tx -d pull -a
cd apps/pdf-viewer/l10n && tx -d pull -a
cd apps/media-viewer/l10n && tx -d pull -a

.PHONY: l10n-clean
l10n-clean:
Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/components/Collaborators/SharedFilesList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export default {
client: this.$client,
item: item,
type: type,
translate: this.$gettext()
$gettext: this.$gettext
})
}
}
Expand Down
6 changes: 3 additions & 3 deletions apps/files/src/store/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ export default {
},

// TODO: Think of a better name
pendingShare (context, { client, item, type, translate }) {
pendingShare (context, { client, item, type, $gettext }) {
// TODO: Move request to owncloud-sdk
client.requests.ocs({
service: 'apps/files_sharing',
Expand All @@ -819,12 +819,12 @@ export default {
.then(_ => {
context.dispatch('loadFolderSharedWithMe', {
client: client,
$gettext: translate
$gettext: $gettext
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can just write $gettext here, no key: value required.

})
})
.catch(e => {
context.dispatch('showMessage', {
title: translate('Error while changing share state'),
title: $gettext('Error while changing share state'),
desc: e.message,
status: 'danger'
}, { root: true })
Expand Down
9 changes: 9 additions & 0 deletions changelog/unreleased/3012
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Bugfix: Fix issue with translate function for pending shares

The pending shares was wrongly passing in a translation function, which caused
translations to be missing in the error message but also it broke the general
translation sync process with Transifex.
Thanks to this change the translations will be up to date again.

https://github.com/owncloud/phoenix/issues/3012
https://github.com/owncloud/phoenix/pull/3014