summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@owncloud.com>2016-02-24 08:34:07 +0100
committerJoas Schilling <nickvergessen@owncloud.com>2016-02-26 09:14:28 +0100
commit4471f359b1a24462309e863948a4583d67b37aef (patch)
tree5e5c313cf84f136dff086e5e092e73e9de137a0c
parent5718402277b3d9a8bd688e3fbbf965bcf19addbe (diff)
downloadnextcloud-server-4471f359b1a24462309e863948a4583d67b37aef.tar.gz
nextcloud-server-4471f359b1a24462309e863948a4583d67b37aef.zip
Rename system tags app to collaborative tags
-rw-r--r--apps/systemtags/appinfo/info.xml5
-rw-r--r--apps/systemtags/js/systemtagsinfoview.js2
-rw-r--r--core/js/systemtags/systemtagsinputfield.js2
3 files changed, 5 insertions, 4 deletions
diff --git a/apps/systemtags/appinfo/info.xml b/apps/systemtags/appinfo/info.xml
index d0b4c1fce00..40eeeb24811 100644
--- a/apps/systemtags/appinfo/info.xml
+++ b/apps/systemtags/appinfo/info.xml
@@ -1,8 +1,9 @@
<?xml version="1.0"?>
<info>
<id>systemtags</id>
- <name>System tags</name>
- <description>System-wide tags user interface</description>
+ <name>Collaborative tags</name>
+ <description>Collaborative tagging functionality which shares tags among users. Great for teams.
+ (If you are a provider with a multi-tenancy installation, it is advised to deactivate this app as tags are shared.)</description>
<licence>AGPL</licence>
<author>Vincent Petry</author>
<default_enable/>
diff --git a/apps/systemtags/js/systemtagsinfoview.js b/apps/systemtags/js/systemtagsinfoview.js
index 2e808f9a84f..2f01ca7db34 100644
--- a/apps/systemtags/js/systemtagsinfoview.js
+++ b/apps/systemtags/js/systemtagsinfoview.js
@@ -100,7 +100,7 @@
* This will automatically adjust the tag mapping collection to
* container the new name.
*
- * @param {OC.Backbone.Model} changedTag tag model that has changed
+ * @param {OC.Backbone.Model} tagId tag model that has changed
*/
_onTagDeletedGlobally: function(tagId) {
// also rename it in the selection, if applicable
diff --git a/core/js/systemtags/systemtagsinputfield.js b/core/js/systemtags/systemtagsinputfield.js
index a64e5386102..148d52b57dd 100644
--- a/core/js/systemtags/systemtagsinputfield.js
+++ b/core/js/systemtags/systemtagsinputfield.js
@@ -375,7 +375,7 @@
this.$el.find('[title]').tooltip({placement: 'bottom'});
this.$tagsField = this.$el.find('[name=tags]');
this.$tagsField.select2({
- placeholder: t('core', 'Global tags'),
+ placeholder: t('core', 'Collaborative tags'),
containerCssClass: 'systemtags-select2-container',
dropdownCssClass: 'systemtags-select2-dropdown',
closeOnSelect: false,