mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename "not-assignble" to "restricted"

This commit is contained in:
Vincent Petry 2016-05-18 11:23:23 +02:00
parent c7373798ba
commit 66e93561da
No known key found for this signature in database
GPG Key ID: AF8F9EFC56562186
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/systemtags/lib/Activity/Extension.php
View File

@ -324,7 +324,7 @@ class Extension implements IExtension {
case 'assignable':
return '<parameter>' . $matches[1] . '</parameter>';
case 'not-assignable':
return '<parameter>' . $l->t('%s (not-assignable)', $matches[1]) . '</parameter>';
return '<parameter>' . $l->t('%s (restricted)', $matches[1]) . '</parameter>';
case 'invisible':
return '<parameter>' . $l->t('%s (invisible)', $matches[1]) . '</parameter>';
}

2
core/js/systemtags/systemtags.js
View File

@ -36,7 +36,7 @@
var scope;
if (!tag.userAssignable) {
scope = t('core', 'not assignable');
scope = t('core', 'restricted');
}
if (!tag.userVisible) {
// invisible also implicitly means not assignable

2
core/js/tests/specs/systemtags/systemtagsSpec.js
View File

@ -64,6 +64,6 @@ describe('OC.SystemTags tests', function() {
testScope(true, true, 'Fourty Two');
testScope(false, true, 'Fourty Two (invisible)');
testScope(false, false, 'Fourty Two (invisible)');
testScope(true, false, 'Fourty Two (not assignable)');
testScope(true, false, 'Fourty Two (restricted)');
});
});

2
core/js/tests/specs/systemtags/systemtagsinputfieldSpec.js
View File

@ -487,7 +487,7 @@ describe('OC.SystemTags.SystemTagsInputField tests', function() {
expect(models[0].locked).toBeFalsy();
expect(models[1].id).toEqual('3');
expect(models[1].name).toEqual('test3');
// not assignable / cannot assign locks the entry
// restricted / cannot assign locks the entry
expect(models[1].locked).toEqual(true);
expect(models[2].id).toEqual('4');
expect(models[2].name).toEqual('test4');