Skip to content

Bugfix/noid/collections #14892

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
rullzer merged 6 commits into from
Mar 29, 2019
Merged

Bugfix/noid/collections #14892

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c556011
Make the endpoint more robust against faulty resource providers
nickvergessen Mar 28, 2019
d4771be
Make sure the recursive result is returned :-X
nickvergessen Mar 28, 2019
cfa6c7c
Escape the search terms on the server
nickvergessen Mar 28, 2019
635df15
Move translations to core
juliusknorr Mar 28, 2019
dd50a5c
Bump nextcloud-vue-collections to 0.3.0
juliusknorr Mar 28, 2019
15a2900
Bump bundles
juliusknorr Mar 28, 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
Prev Previous commit
Next Next commit
Move translations to core 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Mar 28, 2019
commit 635df15ff2e42424ffa6d1935ddd8e9829b24587
7 changes: 0 additions & 7 deletions apps/files_sharing/src/views/CollaborationView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,6 @@
<script>
import { CollectionList } from 'nextcloud-vue-collections'

/**
* Those translations will be used by the vue component but they should be shipped with the server
* t('files_sharing', 'Add to a collection')
* t('files_sharing', 'Details')
* t('files_sharing', 'Rename collection')
*/

export default {
name: 'CollaborationView',
computed: {
Expand Down
13 changes: 12 additions & 1 deletion core/src/OCP/collaboration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,17 @@
**/
let types = {};

/**
* Those translations will be used by the vue component but they should be shipped with the server
* t('core', 'Add to a collection')
* t('core', 'Show details')
* t('core', 'Hide details')
* t('core', 'Rename collection')
* t('core', 'Failed to rename collection')
* t('core', 'Failed to create collection')
* t('core', 'Failed to add resource to collection')
*/

export default {
/**
*
Expand All @@ -51,7 +62,7 @@ export default {
return types[type].typeIconClass || '';
},
getLabel(type) {
return t('files_sharing', 'Link to a {label}', { label: types[type].typeString || type }, 1)
return t('core', 'Link to a {label}', { label: types[type].typeString || type }, 1)
},
getLink(type, id) {
/* TODO: Allow action to be executed instead of href as well */
Expand Down