Skip to content

Get translations from correct app #35041

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

Merged
PVince81 merged 4 commits into from
Apr 18, 2019
Merged

Get translations from correct app #35041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b7ef25
Fixup files_sharing translation calls
phil-davis Apr 17, 2019
8d3b8dd
Fixup federatedfilesharing translation calls
phil-davis Apr 17, 2019
7f61619
Fixup files_trashbin translation calls
phil-davis Apr 17, 2019
bb5b300
Fixup files_versions translation calls
phil-davis Apr 17, 2019
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
2 changes: 1 addition & 1 deletion apps/federatedfilesharing/js/public.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$(document).ready(function() {
$('#header #details').prepend(
'<span id="save">' +
' <button id="save-button">'+t('files_sharing', 'Add to your ownCloud')+'</button>' +
' <button id="save-button">'+t('federatedfilesharing', 'Add to your ownCloud')+'</button>' +
' <form class="save-form hidden" action="#">' +
' <input type="text" id="remote_address" placeholder="example.com/owncloud"/>' +
' <button id="save-button-confirm" class="icon-confirm svg" disabled></button>' +
Expand Down
4 changes: 2 additions & 2 deletions apps/files_sharing/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ OCA.Sharing.App = {
if(response.responseJSON && response.responseJSON.message) {
message = ': ' + response.responseJSON.message;
}
OC.Notification.show(t('files', 'An error occurred while updating share state: {message}', {message: message}), {type: 'error'});
OC.Notification.show(t('files_sharing', 'An error occurred while updating share state: {message}', {message: message}), {type: 'error'});
});
return xhr;
},
Expand All @@ -239,7 +239,7 @@ OCA.Sharing.App = {
path: OC.dirname(data.file_target)
});
} else {
OC.Notification.show(t('files', 'An error occurred while updating share state: {message}', {message: meta.message}), {type: 'error'});
OC.Notification.show(t('files_sharing', 'An error occurred while updating share state: {message}', {message: meta.message}), {type: 'error'});
}
}
context.fileList.showFileBusyState(context.$file, false);
Expand Down
2 changes: 1 addition & 1 deletion apps/files_trashbin/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ OCA.Trashbin.App = {

fileActions.registerAction({
name: 'Delete',
displayName: t('files', 'Delete'),
displayName: t('files_trashbin', 'Delete'),
mime: 'all',
permissions: OC.PERMISSION_READ,
iconClass: 'icon-delete',
Expand Down
4 changes: 2 additions & 2 deletions apps/files_trashbin/js/filelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,15 +350,15 @@
if (result.status === 403) {
// Go home
this.changeDirectory('/');
OC.Notification.show(t('files', 'This operation is forbidden'));
OC.Notification.show(t('files_trashbin', 'This operation is forbidden'));
return false;
}

// Did share service die or something else fail?
if (result.status === 500) {
// Go home
this.changeDirectory('/');
OC.Notification.show(t('files', 'This directory is unavailable, please check the logs or contact the administrator'));
OC.Notification.show(t('files_trashbin', 'This directory is unavailable, please check the logs or contact the administrator'));
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion apps/files_versions/js/versionstabview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
fileInfoModel.trigger('busy', fileInfoModel, false);
self.$el.find('.versions').removeClass('hidden');
self._toggleLoading(false);
OC.Notification.show(t('files_version', 'Failed to revert {file} to revision {timestamp}.',
OC.Notification.show(t('files_versions', 'Failed to revert {file} to revision {timestamp}.',
{
file: versionModel.getFullPath(),
timestamp: OC.Util.formatDate(versionModel.get('timestamp') * 1000)
Expand Down