summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/systemtags/lib/Activity/Extension.php2
-rw-r--r--core/js/systemtags/systemtags.js2
-rw-r--r--core/js/tests/specs/systemtags/systemtagsSpec.js2
-rw-r--r--core/js/tests/specs/systemtags/systemtagsinputfieldSpec.js2
4 files changed, 4 insertions, 4 deletions
diff --git a/apps/systemtags/lib/Activity/Extension.php b/apps/systemtags/lib/Activity/Extension.php
index 8c101a6f550..6bb83e37cfc 100644
--- a/apps/systemtags/lib/Activity/Extension.php
+++ b/apps/systemtags/lib/Activity/Extension.php
@@ -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>';
}
diff --git a/core/js/systemtags/systemtags.js b/core/js/systemtags/systemtags.js
index 042f49bb8ed..05ead6f3dcd 100644
--- a/core/js/systemtags/systemtags.js
+++ b/core/js/systemtags/systemtags.js
@@ -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
diff --git a/core/js/tests/specs/systemtags/systemtagsSpec.js b/core/js/tests/specs/systemtags/systemtagsSpec.js
index 515b75258a0..f6d99e62a3c 100644
--- a/core/js/tests/specs/systemtags/systemtagsSpec.js
+++ b/core/js/tests/specs/systemtags/systemtagsSpec.js
@@ -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)');
});
});
diff --git a/core/js/tests/specs/systemtags/systemtagsinputfieldSpec.js b/core/js/tests/specs/systemtags/systemtagsinputfieldSpec.js
index cafc6e7842b..503bef7cf2b 100644
--- a/core/js/tests/specs/systemtags/systemtagsinputfieldSpec.js
+++ b/core/js/tests/specs/systemtags/systemtagsinputfieldSpec.js
@@ -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');