aboutsummaryrefslogtreecommitdiffstats
path: root/apps/comments
diff options
context:
space:
mode:
Diffstat (limited to 'apps/comments')
-rw-r--r--apps/comments/appinfo/info.xml4
-rw-r--r--apps/comments/js/commentmodel.js36
-rw-r--r--apps/comments/js/commentsummarymodel.js11
-rw-r--r--apps/comments/js/filesplugin.js11
-rw-r--r--apps/comments/l10n/ca.js38
-rw-r--r--apps/comments/l10n/ca.json38
-rw-r--r--apps/comments/l10n/cs_CZ.js8
-rw-r--r--apps/comments/l10n/cs_CZ.json8
-rw-r--r--apps/comments/l10n/de_DE.js10
-rw-r--r--apps/comments/l10n/de_DE.json10
-rw-r--r--apps/comments/l10n/fr.js2
-rw-r--r--apps/comments/l10n/fr.json2
-rw-r--r--apps/comments/l10n/lv.js17
-rw-r--r--apps/comments/l10n/lv.json17
-rw-r--r--apps/comments/l10n/nb_NO.js8
-rw-r--r--apps/comments/l10n/nb_NO.json8
-rw-r--r--apps/comments/l10n/pl.js8
-rw-r--r--apps/comments/l10n/pl.json8
-rw-r--r--apps/comments/l10n/ru.js10
-rw-r--r--apps/comments/l10n/ru.json10
-rw-r--r--apps/comments/l10n/sk_SK.js28
-rw-r--r--apps/comments/l10n/sk_SK.json28
-rw-r--r--apps/comments/l10n/sq.js11
-rw-r--r--apps/comments/l10n/sq.json11
-rw-r--r--apps/comments/l10n/sv.js36
-rw-r--r--apps/comments/l10n/sv.json36
-rw-r--r--apps/comments/l10n/zh_CN.js34
-rw-r--r--apps/comments/l10n/zh_CN.json34
-rw-r--r--apps/comments/lib/Activity/Provider.php2
-rw-r--r--apps/comments/lib/Notification/Listener.php15
-rw-r--r--apps/comments/lib/Notification/Notifier.php6
-rw-r--r--apps/comments/tests/Unit/Notification/ListenerTest.php8
32 files changed, 375 insertions, 138 deletions
diff --git a/apps/comments/appinfo/info.xml b/apps/comments/appinfo/info.xml
index 9d5409a2d62..eb711c4b569 100644
--- a/apps/comments/appinfo/info.xml
+++ b/apps/comments/appinfo/info.xml
@@ -6,9 +6,9 @@
<licence>AGPL</licence>
<author>Arthur Schiwon, Vincent Petry</author>
<default_enable/>
- <version>1.1.0</version>
+ <version>1.2.0</version>
<dependencies>
- <nextcloud min-version="11" max-version="11" />
+ <nextcloud min-version="12" max-version="12" />
</dependencies>
<types>
<logging/>
diff --git a/apps/comments/js/commentmodel.js b/apps/comments/js/commentmodel.js
index e75c79b3f08..3711e53c9f3 100644
--- a/apps/comments/js/commentmodel.js
+++ b/apps/comments/js/commentmodel.js
@@ -9,7 +9,20 @@
*/
(function(OC, OCA) {
- var NS_OWNCLOUD = 'http://owncloud.org/ns';
+
+ _.extend(OC.Files.Client, {
+ PROPERTY_FILEID: '{' + OC.Files.Client.NS_OWNCLOUD + '}id',
+ PROPERTY_MESSAGE: '{' + OC.Files.Client.NS_OWNCLOUD + '}message',
+ PROPERTY_ACTORTYPE: '{' + OC.Files.Client.NS_OWNCLOUD + '}actorType',
+ PROPERTY_ACTORID: '{' + OC.Files.Client.NS_OWNCLOUD + '}actorId',
+ PROPERTY_ISUNREAD: '{' + OC.Files.Client.NS_OWNCLOUD + '}isUnread',
+ PROPERTY_OBJECTID: '{' + OC.Files.Client.NS_OWNCLOUD + '}objectId',
+ PROPERTY_OBJECTTYPE: '{' + OC.Files.Client.NS_OWNCLOUD + '}objectType',
+ PROPERTY_ACTORDISPLAYNAME: '{' + OC.Files.Client.NS_OWNCLOUD + '}actorDisplayName',
+ PROPERTY_CREATIONDATETIME: '{' + OC.Files.Client.NS_OWNCLOUD + '}creationDateTime',
+ PROPERTY_MENTIONS: '{' + OC.Files.Client.NS_OWNCLOUD + '}mentions'
+ });
+
/**
* @class OCA.Comments.CommentModel
* @classdesc
@@ -27,16 +40,16 @@
},
davProperties: {
- 'id': '{' + NS_OWNCLOUD + '}id',
- 'message': '{' + NS_OWNCLOUD + '}message',
- 'actorType': '{' + NS_OWNCLOUD + '}actorType',
- 'actorId': '{' + NS_OWNCLOUD + '}actorId',
- 'actorDisplayName': '{' + NS_OWNCLOUD + '}actorDisplayName',
- 'creationDateTime': '{' + NS_OWNCLOUD + '}creationDateTime',
- 'objectType': '{' + NS_OWNCLOUD + '}objectType',
- 'objectId': '{' + NS_OWNCLOUD + '}objectId',
- 'isUnread': '{' + NS_OWNCLOUD + '}isUnread',
- 'mentions': '{' + NS_OWNCLOUD + '}mentions'
+ 'id': OC.Files.Client.PROPERTY_FILEID,
+ 'message': OC.Files.Client.PROPERTY_MESSAGE,
+ 'actorType': OC.Files.Client.PROPERTY_ACTORTYPE,
+ 'actorId': OC.Files.Client.PROPERTY_ACTORID,
+ 'actorDisplayName': OC.Files.Client.PROPERTY_ACTORDISPLAYNAME,
+ 'creationDateTime': OC.Files.Client.PROPERTY_CREATIONDATETIME,
+ 'objectType': OC.Files.Client.PROPERTY_OBJECTTYPE,
+ 'objectId': OC.Files.Client.PROPERTY_OBJECTID,
+ 'isUnread': OC.Files.Client.PROPERTY_ISUNREAD,
+ 'mentions': OC.Files.Client.PROPERTY_MENTIONS
},
parse: function(data) {
@@ -78,4 +91,3 @@
OCA.Comments.CommentModel = CommentModel;
})(OC, OCA);
-
diff --git a/apps/comments/js/commentsummarymodel.js b/apps/comments/js/commentsummarymodel.js
index d405315ca1f..ffabbc30fb4 100644
--- a/apps/comments/js/commentsummarymodel.js
+++ b/apps/comments/js/commentsummarymodel.js
@@ -9,13 +9,17 @@
*/
(function(OC, OCA) {
- var NS_OWNCLOUD = 'http://owncloud.org/ns';
+
+ _.extend(OC.Files.Client, {
+ PROPERTY_READMARKER: '{' + OC.Files.Client.NS_OWNCLOUD + '}readMarker'
+ });
+
/**
* @class OCA.Comments.CommentSummaryModel
* @classdesc
*
* Model containing summary information related to comments
- * like the read marker.
+ * like the read marker.
*
*/
var CommentSummaryModel = OC.Backbone.Model.extend(
@@ -37,7 +41,7 @@
_objectId: null,
davProperties: {
- 'readMarker': '{' + NS_OWNCLOUD + '}readMarker'
+ 'readMarker': OC.Files.Client.PROPERTY_READMARKER
},
/**
@@ -62,4 +66,3 @@
OCA.Comments.CommentSummaryModel = CommentSummaryModel;
})(OC, OCA);
-
diff --git a/apps/comments/js/filesplugin.js b/apps/comments/js/filesplugin.js
index cc419c18ddb..8c5762065a1 100644
--- a/apps/comments/js/filesplugin.js
+++ b/apps/comments/js/filesplugin.js
@@ -11,6 +11,11 @@
/* global Handlebars */
(function() {
+
+ _.extend(OC.Files.Client, {
+ PROPERTY_COMMENTS_UNREAD: '{' + OC.Files.Client.NS_OWNCLOUD + '}comments-unread'
+ });
+
var TEMPLATE_COMMENTS_UNREAD =
'<a class="action action-comment permanent" title="{{countMessage}}" href="#">' +
'<img class="svg" src="{{iconUrl}}"/>' +
@@ -52,19 +57,17 @@
fileList.registerTabView(new OCA.Comments.CommentsTabView('commentsTabView'));
- var NS_OC = 'http://owncloud.org/ns';
-
var oldGetWebdavProperties = fileList._getWebdavProperties;
fileList._getWebdavProperties = function() {
var props = oldGetWebdavProperties.apply(this, arguments);
- props.push('{' + NS_OC + '}comments-unread');
+ props.push(OC.Files.Client.PROPERTY_COMMENTS_UNREAD);
return props;
};
fileList.filesClient.addFileInfoParser(function(response) {
var data = {};
var props = response.propStat[0].properties;
- var commentsUnread = props['{' + NS_OC + '}comments-unread'];
+ var commentsUnread = props[OC.Files.Client.PROPERTY_COMMENTS_UNREAD];
if (!_.isUndefined(commentsUnread) && commentsUnread !== '') {
data.commentsUnread = parseInt(commentsUnread, 10);
}
diff --git a/apps/comments/l10n/ca.js b/apps/comments/l10n/ca.js
index 9ad9f962572..e97f85ec407 100644
--- a/apps/comments/l10n/ca.js
+++ b/apps/comments/l10n/ca.js
@@ -1,23 +1,39 @@
OC.L10N.register(
"comments",
{
- "Type in a new comment..." : "Escriu en un nou comentari...",
+ "Comments" : "Comentaris",
+ "Unknown user" : "Usuari desconegut",
+ "New comment …" : "Nou comentari...",
"Delete comment" : "Esborrar comentari",
"Post" : "Publica",
"Cancel" : "Cancel·la",
"Edit comment" : "Editar comentari",
"[Deleted user]" : "[usuari Esborrat]",
- "Comments" : "Comentaris",
- "No other comments available" : "No hi han altres comentaris disponibles",
- "More comments..." : "Més comentaris",
+ "No comments yet, start the conversation!" : "Encara no hi ha comentaris. Comenceu la conversa!",
+ "More comments …" : "Més comentaris...",
"Save" : "Desa",
- "Allowed characters {count} of {max}" : "caracters Permessos {count} de {max}",
- "{count} unread comments" : "{count} comentaris no llegits",
+ "Allowed characters {count} of {max}" : "{count} caràcters permesos de {max}",
+ "Error occurred while retrieving comment with id {id}" : "Hi ha hagut un error en extraure el comentari amb id {id}",
+ "Error occurred while updating comment with id {id}" : "Hi ha hagut un error en actualitzar el comentari amb id {id}",
+ "Error occurred while posting comment" : "Hi ha hagut un error en publicar el comentari",
+ "_%n unread comment_::_%n unread comments_" : ["%n comentari no llegit","%n comentaris no llegits"],
"Comment" : "Comentari",
- "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentaris</strong> per arxius <em>(sempre llistat en corrent)",
- "You commented" : "Has comentat",
- "%1$s commented" : "%1$s comentat",
- "You commented on %2$s" : "Has comentat a %2$s",
- "%1$s commented on %2$s" : "%1$s ha comentat a %2$s"
+ "You commented" : "Heu comentat",
+ "%1$s commented" : "%1$s ha comentat",
+ "{author} commented" : "{author} ha comentat",
+ "You commented on %1$s" : "Heu comentat a %1$s",
+ "You commented on {file}" : "Heu comentat a {file}",
+ "%1$s commented on %2$s" : "%1$s ha comentat a %2$s",
+ "{author} commented on {file}" : "{author} ha comentat a {file}",
+ "<strong>Comments</strong> for files" : "<strong>Comentaris</strong> per arxius",
+ "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuari (ara) esborrat us ha nomenat en un comentari a “%s”",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuari (ara) esborrat us ha nomenat en un comentari de “{file}”",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s us ha nomenat en un comentari a “%2$s”",
+ "{user} mentioned you in a comment on “{file}”" : "{user} us ha nomenat en un comentari de “{file}”",
+ "Type in a new comment..." : "Escriviu un nou comentari...",
+ "No other comments available" : "No hi ha altres comentaris disponibles",
+ "More comments..." : "Més comentaris...",
+ "{count} unread comments" : "{count} comentaris no llegits",
+ "You commented on %2$s" : "Heu comentat a %2$s"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/comments/l10n/ca.json b/apps/comments/l10n/ca.json
index f6df3abce3b..599ff0afa10 100644
--- a/apps/comments/l10n/ca.json
+++ b/apps/comments/l10n/ca.json
@@ -1,21 +1,37 @@
{ "translations": {
- "Type in a new comment..." : "Escriu en un nou comentari...",
+ "Comments" : "Comentaris",
+ "Unknown user" : "Usuari desconegut",
+ "New comment …" : "Nou comentari...",
"Delete comment" : "Esborrar comentari",
"Post" : "Publica",
"Cancel" : "Cancel·la",
"Edit comment" : "Editar comentari",
"[Deleted user]" : "[usuari Esborrat]",
- "Comments" : "Comentaris",
- "No other comments available" : "No hi han altres comentaris disponibles",
- "More comments..." : "Més comentaris",
+ "No comments yet, start the conversation!" : "Encara no hi ha comentaris. Comenceu la conversa!",
+ "More comments …" : "Més comentaris...",
"Save" : "Desa",
- "Allowed characters {count} of {max}" : "caracters Permessos {count} de {max}",
- "{count} unread comments" : "{count} comentaris no llegits",
+ "Allowed characters {count} of {max}" : "{count} caràcters permesos de {max}",
+ "Error occurred while retrieving comment with id {id}" : "Hi ha hagut un error en extraure el comentari amb id {id}",
+ "Error occurred while updating comment with id {id}" : "Hi ha hagut un error en actualitzar el comentari amb id {id}",
+ "Error occurred while posting comment" : "Hi ha hagut un error en publicar el comentari",
+ "_%n unread comment_::_%n unread comments_" : ["%n comentari no llegit","%n comentaris no llegits"],
"Comment" : "Comentari",
- "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentaris</strong> per arxius <em>(sempre llistat en corrent)",
- "You commented" : "Has comentat",
- "%1$s commented" : "%1$s comentat",
- "You commented on %2$s" : "Has comentat a %2$s",
- "%1$s commented on %2$s" : "%1$s ha comentat a %2$s"
+ "You commented" : "Heu comentat",
+ "%1$s commented" : "%1$s ha comentat",
+ "{author} commented" : "{author} ha comentat",
+ "You commented on %1$s" : "Heu comentat a %1$s",
+ "You commented on {file}" : "Heu comentat a {file}",
+ "%1$s commented on %2$s" : "%1$s ha comentat a %2$s",
+ "{author} commented on {file}" : "{author} ha comentat a {file}",
+ "<strong>Comments</strong> for files" : "<strong>Comentaris</strong> per arxius",
+ "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuari (ara) esborrat us ha nomenat en un comentari a “%s”",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuari (ara) esborrat us ha nomenat en un comentari de “{file}”",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s us ha nomenat en un comentari a “%2$s”",
+ "{user} mentioned you in a comment on “{file}”" : "{user} us ha nomenat en un comentari de “{file}”",
+ "Type in a new comment..." : "Escriviu un nou comentari...",
+ "No other comments available" : "No hi ha altres comentaris disponibles",
+ "More comments..." : "Més comentaris...",
+ "{count} unread comments" : "{count} comentaris no llegits",
+ "You commented on %2$s" : "Heu comentat a %2$s"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/comments/l10n/cs_CZ.js b/apps/comments/l10n/cs_CZ.js
index 17231a3fa45..da14fcf91b8 100644
--- a/apps/comments/l10n/cs_CZ.js
+++ b/apps/comments/l10n/cs_CZ.js
@@ -20,8 +20,16 @@ OC.L10N.register(
"Comment" : "Komentář",
"You commented" : "Okomentoval(a) jsi",
"%1$s commented" : "%1$s okomentován",
+ "{author} commented" : "{author} okomentoval(a)",
+ "You commented on %1$s" : "Okomentoval(a) jste %1$s",
+ "You commented on {file}" : "Okomentoval(a) jste {file}",
"%1$s commented on %2$s" : "%1$s okomentoval %2$s",
+ "{author} commented on {file}" : "{author} okomentoval(a) {file}",
"<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
+ "A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní již smazaný uživatel vás zmínil v komentáři u \"{file}\"",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s",
+ "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil v komentáři u “{file}”",
"Type in a new comment..." : "Zadat nový komentář...",
"No other comments available" : "Nejsou dostupné žádné další komentáře",
"More comments..." : "Více komentářů...",
diff --git a/apps/comments/l10n/cs_CZ.json b/apps/comments/l10n/cs_CZ.json
index a1435f9b3bf..1f1a84b6c09 100644
--- a/apps/comments/l10n/cs_CZ.json
+++ b/apps/comments/l10n/cs_CZ.json
@@ -18,8 +18,16 @@
"Comment" : "Komentář",
"You commented" : "Okomentoval(a) jsi",
"%1$s commented" : "%1$s okomentován",
+ "{author} commented" : "{author} okomentoval(a)",
+ "You commented on %1$s" : "Okomentoval(a) jste %1$s",
+ "You commented on {file}" : "Okomentoval(a) jste {file}",
"%1$s commented on %2$s" : "%1$s okomentoval %2$s",
+ "{author} commented on {file}" : "{author} okomentoval(a) {file}",
"<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
+ "A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní již smazaný uživatel vás zmínil v komentáři u \"{file}\"",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s",
+ "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil v komentáři u “{file}”",
"Type in a new comment..." : "Zadat nový komentář...",
"No other comments available" : "Nejsou dostupné žádné další komentáře",
"More comments..." : "Více komentářů...",
diff --git a/apps/comments/l10n/de_DE.js b/apps/comments/l10n/de_DE.js
index ce1e52ffc60..3f7f94fb7c5 100644
--- a/apps/comments/l10n/de_DE.js
+++ b/apps/comments/l10n/de_DE.js
@@ -20,16 +20,16 @@ OC.L10N.register(
"Comment" : "Kommentar",
"You commented" : "Sie haben kommentiert",
"%1$s commented" : "%1$s kommentierte",
- "{author} commented" : "{author} kommentiert",
+ "{author} commented" : "{author} kommentierte",
"You commented on %1$s" : "Sie haben %1$s kommentiert",
"You commented on {file}" : "Sie haben {file} kommentiert",
"%1$s commented on %2$s" : "%1$s kommentierte %2$s",
"{author} commented on {file}" : "{author} hat {file} kommentiert",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
- "A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Nutzer erwähnt Sie in einem Kommentar zu \"%s\"",
- "A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Nutzer erwähnt Sie in einem Kommentar zu “{file}”",
- "%1$s mentioned you in a comment on “%2$s”" : "%1$s erwähnt Sie in einem Kommentar zu “%2$s”",
- "{user} mentioned you in a comment on “{file}”" : "{user} erwähnt Sie in einem Kommentar zu “{file}”",
+ "A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu \"%s\" erwähnt",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu “{file}” erwähnt",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Sie in einem Kommentar zu “%2$s” erwähnt.",
+ "{user} mentioned you in a comment on “{file}”" : "{user} hat Sie in einem Kommentar zu “{file}” erwähnt",
"Type in a new comment..." : "Neuen Kommentar eingeben...",
"No other comments available" : "Keine weiteren Kommentare verfügbar",
"More comments..." : "Weitere Kommentare...",
diff --git a/apps/comments/l10n/de_DE.json b/apps/comments/l10n/de_DE.json
index e83ee533cb2..de0474199ef 100644
--- a/apps/comments/l10n/de_DE.json
+++ b/apps/comments/l10n/de_DE.json
@@ -18,16 +18,16 @@
"Comment" : "Kommentar",
"You commented" : "Sie haben kommentiert",
"%1$s commented" : "%1$s kommentierte",
- "{author} commented" : "{author} kommentiert",
+ "{author} commented" : "{author} kommentierte",
"You commented on %1$s" : "Sie haben %1$s kommentiert",
"You commented on {file}" : "Sie haben {file} kommentiert",
"%1$s commented on %2$s" : "%1$s kommentierte %2$s",
"{author} commented on {file}" : "{author} hat {file} kommentiert",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
- "A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Nutzer erwähnt Sie in einem Kommentar zu \"%s\"",
- "A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Nutzer erwähnt Sie in einem Kommentar zu “{file}”",
- "%1$s mentioned you in a comment on “%2$s”" : "%1$s erwähnt Sie in einem Kommentar zu “%2$s”",
- "{user} mentioned you in a comment on “{file}”" : "{user} erwähnt Sie in einem Kommentar zu “{file}”",
+ "A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu \"%s\" erwähnt",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu “{file}” erwähnt",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Sie in einem Kommentar zu “%2$s” erwähnt.",
+ "{user} mentioned you in a comment on “{file}”" : "{user} hat Sie in einem Kommentar zu “{file}” erwähnt",
"Type in a new comment..." : "Neuen Kommentar eingeben...",
"No other comments available" : "Keine weiteren Kommentare verfügbar",
"More comments..." : "Weitere Kommentare...",
diff --git a/apps/comments/l10n/fr.js b/apps/comments/l10n/fr.js
index 21641df269b..588f429babc 100644
--- a/apps/comments/l10n/fr.js
+++ b/apps/comments/l10n/fr.js
@@ -9,7 +9,7 @@ OC.L10N.register(
"Cancel" : "Annuler",
"Edit comment" : "Modifier le commentaire",
"[Deleted user]" : "[Utilisateur supprimé]",
- "No comments yet, start the conversation!" : "Il n'y a aucun commentaire, démarrer la conversation!",
+ "No comments yet, start the conversation!" : "Aucun commentaire actuellement, débutez une conversation !",
"More comments …" : "Plus de commentaires ...",
"Save" : "Enregistrer",
"Allowed characters {count} of {max}" : "{count} sur {max} caractères autorisés",
diff --git a/apps/comments/l10n/fr.json b/apps/comments/l10n/fr.json
index c8aa168fc3c..71e3823b84a 100644
--- a/apps/comments/l10n/fr.json
+++ b/apps/comments/l10n/fr.json
@@ -7,7 +7,7 @@
"Cancel" : "Annuler",
"Edit comment" : "Modifier le commentaire",
"[Deleted user]" : "[Utilisateur supprimé]",
- "No comments yet, start the conversation!" : "Il n'y a aucun commentaire, démarrer la conversation!",
+ "No comments yet, start the conversation!" : "Aucun commentaire actuellement, débutez une conversation !",
"More comments …" : "Plus de commentaires ...",
"Save" : "Enregistrer",
"Allowed characters {count} of {max}" : "{count} sur {max} caractères autorisés",
diff --git a/apps/comments/l10n/lv.js b/apps/comments/l10n/lv.js
index c30721e9df4..ff597383f15 100644
--- a/apps/comments/l10n/lv.js
+++ b/apps/comments/l10n/lv.js
@@ -2,25 +2,36 @@ OC.L10N.register(
"comments",
{
"Comments" : "Komentāri",
+ "Unknown user" : "Nezināms lietotājs",
+ "New comment …" : "Jauns komentārs...",
"Delete comment" : "Dzēst komentāru",
"Post" : "Pievienot",
"Cancel" : "Atcelt",
"Edit comment" : "Rediģēt komentāru",
"[Deleted user]" : "[Dzēsts lietotājs]",
+ "No comments yet, start the conversation!" : "Vēl nav komentāru, uzsāciet sarunu!",
+ "More comments …" : "Vairāk komentāri...",
"Save" : "Saglabāt",
"Allowed characters {count} of {max}" : "Atļautās zīmes {count} no {max}",
"Error occurred while retrieving comment with id {id}" : "Notika kļūda saņemot komentāru ar id {id}",
"Error occurred while updating comment with id {id}" : "Kļūda atjauninot komentāru ar id {id}",
"Error occurred while posting comment" : "Notika kļūda pievienojot komentāru",
+ "_%n unread comment_::_%n unread comments_" : ["%n nelasīti komentāri","%n nelasīti komentāri","%n nelasīti komentāri"],
"Comment" : "Komentārs",
- "<strong>Comments</strong> for files" : "<strong>Komentāri</strong> datnēm",
"You commented" : "Tu komentēji",
"%1$s commented" : "%1$s komentēja",
- "You commented on %2$s" : "Tu komentēji %2$s",
+ "{author} commented" : "{author} komentēja",
+ "You commented on %1$s" : "Tu komentēji %1$s",
+ "You commented on {file}" : "Tu komentēji {file}",
"%1$s commented on %2$s" : "%1$s komentēja %2$s",
+ "{author} commented on {file}" : "{author} komentārs {file}",
+ "<strong>Comments</strong> for files" : "<strong>Komentāri</strong> datnēm",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s minēja jūs komentārā “%2$s”",
+ "{user} mentioned you in a comment on “{file}”" : "{user} minēja jūs komentārā “{file}”",
"Type in a new comment..." : "Raksti jaunu komentāru...",
"No other comments available" : "Nav pieejami citi komentāri",
"More comments..." : "Vairāk komentāri...",
- "{count} unread comments" : "{count} neizlasītu komentāru"
+ "{count} unread comments" : "{count} neizlasītu komentāru",
+ "You commented on %2$s" : "Tu komentēji %2$s"
},
"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/apps/comments/l10n/lv.json b/apps/comments/l10n/lv.json
index 153e7c4edfd..b61037fb568 100644
--- a/apps/comments/l10n/lv.json
+++ b/apps/comments/l10n/lv.json
@@ -1,24 +1,35 @@
{ "translations": {
"Comments" : "Komentāri",
+ "Unknown user" : "Nezināms lietotājs",
+ "New comment …" : "Jauns komentārs...",
"Delete comment" : "Dzēst komentāru",
"Post" : "Pievienot",
"Cancel" : "Atcelt",
"Edit comment" : "Rediģēt komentāru",
"[Deleted user]" : "[Dzēsts lietotājs]",
+ "No comments yet, start the conversation!" : "Vēl nav komentāru, uzsāciet sarunu!",
+ "More comments …" : "Vairāk komentāri...",
"Save" : "Saglabāt",
"Allowed characters {count} of {max}" : "Atļautās zīmes {count} no {max}",
"Error occurred while retrieving comment with id {id}" : "Notika kļūda saņemot komentāru ar id {id}",
"Error occurred while updating comment with id {id}" : "Kļūda atjauninot komentāru ar id {id}",
"Error occurred while posting comment" : "Notika kļūda pievienojot komentāru",
+ "_%n unread comment_::_%n unread comments_" : ["%n nelasīti komentāri","%n nelasīti komentāri","%n nelasīti komentāri"],
"Comment" : "Komentārs",
- "<strong>Comments</strong> for files" : "<strong>Komentāri</strong> datnēm",
"You commented" : "Tu komentēji",
"%1$s commented" : "%1$s komentēja",
- "You commented on %2$s" : "Tu komentēji %2$s",
+ "{author} commented" : "{author} komentēja",
+ "You commented on %1$s" : "Tu komentēji %1$s",
+ "You commented on {file}" : "Tu komentēji {file}",
"%1$s commented on %2$s" : "%1$s komentēja %2$s",
+ "{author} commented on {file}" : "{author} komentārs {file}",
+ "<strong>Comments</strong> for files" : "<strong>Komentāri</strong> datnēm",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s minēja jūs komentārā “%2$s”",
+ "{user} mentioned you in a comment on “{file}”" : "{user} minēja jūs komentārā “{file}”",
"Type in a new comment..." : "Raksti jaunu komentāru...",
"No other comments available" : "Nav pieejami citi komentāri",
"More comments..." : "Vairāk komentāri...",
- "{count} unread comments" : "{count} neizlasītu komentāru"
+ "{count} unread comments" : "{count} neizlasītu komentāru",
+ "You commented on %2$s" : "Tu komentēji %2$s"
},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
} \ No newline at end of file
diff --git a/apps/comments/l10n/nb_NO.js b/apps/comments/l10n/nb_NO.js
index 40c0c3663ad..d6ac9a2b7b6 100644
--- a/apps/comments/l10n/nb_NO.js
+++ b/apps/comments/l10n/nb_NO.js
@@ -20,8 +20,16 @@ OC.L10N.register(
"Comment" : "Kommentar",
"You commented" : "Du kommenterte",
"%1$s commented" : "%1$s kommentert",
+ "{author} commented" : "{author} kommenterte",
+ "You commented on %1$s" : "Du kommenterte på %1$s",
+ "You commented on {file}" : "Du kommenterte på {file}",
"%1$s commented on %2$s" : "%1$s kommenterte %2$s",
+ "{author} commented on {file}" : "{author} kommenterte på {file}",
"<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> for filer",
+ "A (now) deleted user mentioned you in a comment on “%s”" : "En (now) slettet bruker nevnte deg i en kommentar til “%s”",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "A (now) slettet bruker nevnte deg i en kommentar til “{file}”",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s nevnte deg i en kommentar på “%2$s”",
+ "{user} mentioned you in a comment on “{file}”" : "{user} nevnte deg i en kommentar på “{file}”",
"Type in a new comment..." : "Skriv inn en ny kommentar...",
"No other comments available" : "Ingen andre kommentarer tilgjengelig",
"More comments..." : "Flere kommentarer..",
diff --git a/apps/comments/l10n/nb_NO.json b/apps/comments/l10n/nb_NO.json
index 00db3510fee..293eca39e84 100644
--- a/apps/comments/l10n/nb_NO.json
+++ b/apps/comments/l10n/nb_NO.json
@@ -18,8 +18,16 @@
"Comment" : "Kommentar",
"You commented" : "Du kommenterte",
"%1$s commented" : "%1$s kommentert",
+ "{author} commented" : "{author} kommenterte",
+ "You commented on %1$s" : "Du kommenterte på %1$s",
+ "You commented on {file}" : "Du kommenterte på {file}",
"%1$s commented on %2$s" : "%1$s kommenterte %2$s",
+ "{author} commented on {file}" : "{author} kommenterte på {file}",
"<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> for filer",
+ "A (now) deleted user mentioned you in a comment on “%s”" : "En (now) slettet bruker nevnte deg i en kommentar til “%s”",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "A (now) slettet bruker nevnte deg i en kommentar til “{file}”",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s nevnte deg i en kommentar på “%2$s”",
+ "{user} mentioned you in a comment on “{file}”" : "{user} nevnte deg i en kommentar på “{file}”",
"Type in a new comment..." : "Skriv inn en ny kommentar...",
"No other comments available" : "Ingen andre kommentarer tilgjengelig",
"More comments..." : "Flere kommentarer..",
diff --git a/apps/comments/l10n/pl.js b/apps/comments/l10n/pl.js
index 19d5148477c..79c2f364578 100644
--- a/apps/comments/l10n/pl.js
+++ b/apps/comments/l10n/pl.js
@@ -3,7 +3,7 @@ OC.L10N.register(
{
"Comments" : "Komentarze",
"Unknown user" : "Nieznany użytkownik",
- "New comment …" : "Nowy komentarz ...",
+ "New comment …" : "Nowy komentarz...",
"Delete comment" : "Skasuj komentarz",
"Post" : "Zapisz",
"Cancel" : "Anuluj",
@@ -16,9 +16,9 @@ OC.L10N.register(
"Error occurred while retrieving comment with id {id}" : "W trakcie otrzymywania komentarza o identyfikatorze {id} wystąpił błąd.",
"Error occurred while updating comment with id {id}" : "W trakcie aktualizacji komentarza o identyfikatorze {id} wystąpił błąd.",
"Error occurred while posting comment" : "Podczas wysyłania komentarza wystąpił błąd",
- "_%n unread comment_::_%n unread comments_" : ["%n nieprzeczytany komentarz","%n nieprzeczytane komentarze","%n nieprzeczytanych komentarzy"],
+ "_%n unread comment_::_%n unread comments_" : ["%n nieprzeczytany komentarz","%n nieprzeczytane komentarze","%n nieprzeczytanych komentarzy","%n nieprzeczytanych komentarzy"],
"Comment" : "Komentarz",
- "You commented" : "Skomentowałeś/łaś",
+ "You commented" : "Skomentowałeś",
"%1$s commented" : "%1$s skomentował",
"{author} commented" : "{author} skomentował",
"You commented on %1$s" : "Skomentowałeś w %1$s",
@@ -34,6 +34,6 @@ OC.L10N.register(
"No other comments available" : "Nie ma więcej komentarzy",
"More comments..." : "Więcej komentarzy...",
"{count} unread comments" : "{count} nieprzeczytanych komentarzy",
- "You commented on %2$s" : "Skomentowałeś/łaś %2$s"
+ "You commented on %2$s" : "Skomentowałeś %2$s"
},
"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/comments/l10n/pl.json b/apps/comments/l10n/pl.json
index 838f4d1aa44..90566fdfd86 100644
--- a/apps/comments/l10n/pl.json
+++ b/apps/comments/l10n/pl.json
@@ -1,7 +1,7 @@
{ "translations": {
"Comments" : "Komentarze",
"Unknown user" : "Nieznany użytkownik",
- "New comment …" : "Nowy komentarz ...",
+ "New comment …" : "Nowy komentarz...",
"Delete comment" : "Skasuj komentarz",
"Post" : "Zapisz",
"Cancel" : "Anuluj",
@@ -14,9 +14,9 @@
"Error occurred while retrieving comment with id {id}" : "W trakcie otrzymywania komentarza o identyfikatorze {id} wystąpił błąd.",
"Error occurred while updating comment with id {id}" : "W trakcie aktualizacji komentarza o identyfikatorze {id} wystąpił błąd.",
"Error occurred while posting comment" : "Podczas wysyłania komentarza wystąpił błąd",
- "_%n unread comment_::_%n unread comments_" : ["%n nieprzeczytany komentarz","%n nieprzeczytane komentarze","%n nieprzeczytanych komentarzy"],
+ "_%n unread comment_::_%n unread comments_" : ["%n nieprzeczytany komentarz","%n nieprzeczytane komentarze","%n nieprzeczytanych komentarzy","%n nieprzeczytanych komentarzy"],
"Comment" : "Komentarz",
- "You commented" : "Skomentowałeś/łaś",
+ "You commented" : "Skomentowałeś",
"%1$s commented" : "%1$s skomentował",
"{author} commented" : "{author} skomentował",
"You commented on %1$s" : "Skomentowałeś w %1$s",
@@ -32,6 +32,6 @@
"No other comments available" : "Nie ma więcej komentarzy",
"More comments..." : "Więcej komentarzy...",
"{count} unread comments" : "{count} nieprzeczytanych komentarzy",
- "You commented on %2$s" : "Skomentowałeś/łaś %2$s"
+ "You commented on %2$s" : "Skomentowałeś %2$s"
},"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
} \ No newline at end of file
diff --git a/apps/comments/l10n/ru.js b/apps/comments/l10n/ru.js
index 83231e9b7cc..650ff5c7d3d 100644
--- a/apps/comments/l10n/ru.js
+++ b/apps/comments/l10n/ru.js
@@ -2,7 +2,7 @@ OC.L10N.register(
"comments",
{
"Comments" : "Комментарии",
- "Unknown user" : "Пользователь неизвестен",
+ "Unknown user" : "Неизвестный пользователь",
"New comment …" : "Новый комментарий...",
"Delete comment" : "Удалить комментарий",
"Post" : "Опубликовать",
@@ -20,8 +20,16 @@ OC.L10N.register(
"Comment" : "Комментарий",
"You commented" : "Вы прокомментировали",
"%1$s commented" : "%1$s прокомментировано",
+ "{author} commented" : "{author} прокомментировал",
+ "You commented on %1$s" : "Вы прокомментировали %1$s",
+ "You commented on {file}" : "Вы прокомментировали {file}",
"%1$s commented on %2$s" : "%1$s прокомментировано на %2$s",
+ "{author} commented on {file}" : "{author} прокомментировал {file}",
"<strong>Comments</strong> for files" : "<strong>Комментарии</strong> к файлам",
+ "A (now) deleted user mentioned you in a comment on “%s”" : "Пользователь (удалённый в настоящее время) упомянул вас в комментарии к “%s”.",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "Пользователь (удалённый в настоящее время) упомянул вас в комментарии к “{file}”.",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s упомянул вас в комментарии к \"%2$s\"",
+ "{user} mentioned you in a comment on “{file}”" : "{user} упомянул вас в комментарии к “{file}”.",
"Type in a new comment..." : "Напишите новый комментарий...",
"No other comments available" : "Другие комментарии отсутствуют",
"More comments..." : "Ещё комментарии...",
diff --git a/apps/comments/l10n/ru.json b/apps/comments/l10n/ru.json
index 277ecdcecdf..91974f9cdad 100644
--- a/apps/comments/l10n/ru.json
+++ b/apps/comments/l10n/ru.json
@@ -1,6 +1,6 @@
{ "translations": {
"Comments" : "Комментарии",
- "Unknown user" : "Пользователь неизвестен",
+ "Unknown user" : "Неизвестный пользователь",
"New comment …" : "Новый комментарий...",
"Delete comment" : "Удалить комментарий",
"Post" : "Опубликовать",
@@ -18,8 +18,16 @@
"Comment" : "Комментарий",
"You commented" : "Вы прокомментировали",
"%1$s commented" : "%1$s прокомментировано",
+ "{author} commented" : "{author} прокомментировал",
+ "You commented on %1$s" : "Вы прокомментировали %1$s",
+ "You commented on {file}" : "Вы прокомментировали {file}",
"%1$s commented on %2$s" : "%1$s прокомментировано на %2$s",
+ "{author} commented on {file}" : "{author} прокомментировал {file}",
"<strong>Comments</strong> for files" : "<strong>Комментарии</strong> к файлам",
+ "A (now) deleted user mentioned you in a comment on “%s”" : "Пользователь (удалённый в настоящее время) упомянул вас в комментарии к “%s”.",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "Пользователь (удалённый в настоящее время) упомянул вас в комментарии к “{file}”.",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s упомянул вас в комментарии к \"%2$s\"",
+ "{user} mentioned you in a comment on “{file}”" : "{user} упомянул вас в комментарии к “{file}”.",
"Type in a new comment..." : "Напишите новый комментарий...",
"No other comments available" : "Другие комментарии отсутствуют",
"More comments..." : "Ещё комментарии...",
diff --git a/apps/comments/l10n/sk_SK.js b/apps/comments/l10n/sk_SK.js
index 808e0bff4d4..ed68f8f11ed 100644
--- a/apps/comments/l10n/sk_SK.js
+++ b/apps/comments/l10n/sk_SK.js
@@ -1,8 +1,34 @@
OC.L10N.register(
"comments",
{
+ "Comments" : "Komentáre",
+ "Unknown user" : "Neznámy používateľ",
+ "New comment …" : "Nový komentár ...",
+ "Delete comment" : "Zmazať komentár",
+ "Post" : "Odoslať",
"Cancel" : "Zrušiť",
+ "Edit comment" : "Upraviť komentár",
+ "[Deleted user]" : "[Zmazaný užívateľ]",
+ "No comments yet, start the conversation!" : "Žiadne komentáre, začnite konverzáciu!",
+ "More comments …" : "Ďalšie komentáre ...",
"Save" : "Uložiť",
- "Comment" : "Komentár"
+ "Allowed characters {count} of {max}" : "Počet povolených znakov {count} z {max}",
+ "Error occurred while retrieving comment with id {id}" : "Pri načítavaní komentára s id {id} nastala chyba",
+ "Error occurred while updating comment with id {id}" : "Pri aktualizovaní komentára s id {id} nastala chyba",
+ "Error occurred while posting comment" : "Pri odosielaní komentára nastala chyba",
+ "_%n unread comment_::_%n unread comments_" : ["%n neprečítaný komentár","%n neprečítaných komentárov","%n neprečítaných komentárov"],
+ "Comment" : "Komentár",
+ "You commented" : "Komentovali ste",
+ "%1$s commented" : "%1$s komentoval",
+ "{author} commented" : "{author} komentoval",
+ "You commented on %1$s" : "Komentovali ste %1$s",
+ "You commented on {file}" : "Komentovali ste {file}",
+ "%1$s commented on %2$s" : "%1$s komentoval %2$s",
+ "{author} commented on {file}" : "{author} komentoval {file}",
+ "<strong>Comments</strong> for files" : "<strong>Komentáre</strong> pre súbory",
+ "Type in a new comment..." : "Zadať nový komentár...",
+ "No other comments available" : "Žiadne ďalšie komentáre nie sú dostupné",
+ "More comments..." : "Ďalšie komentáre...",
+ "{count} unread comments" : "{count} neprečítaných komentárov"
},
"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/comments/l10n/sk_SK.json b/apps/comments/l10n/sk_SK.json
index 649d040de7a..f85f7dfb3e2 100644
--- a/apps/comments/l10n/sk_SK.json
+++ b/apps/comments/l10n/sk_SK.json
@@ -1,6 +1,32 @@
{ "translations": {
+ "Comments" : "Komentáre",
+ "Unknown user" : "Neznámy používateľ",
+ "New comment …" : "Nový komentár ...",
+ "Delete comment" : "Zmazať komentár",
+ "Post" : "Odoslať",
"Cancel" : "Zrušiť",
+ "Edit comment" : "Upraviť komentár",
+ "[Deleted user]" : "[Zmazaný užívateľ]",
+ "No comments yet, start the conversation!" : "Žiadne komentáre, začnite konverzáciu!",
+ "More comments …" : "Ďalšie komentáre ...",
"Save" : "Uložiť",
- "Comment" : "Komentár"
+ "Allowed characters {count} of {max}" : "Počet povolených znakov {count} z {max}",
+ "Error occurred while retrieving comment with id {id}" : "Pri načítavaní komentára s id {id} nastala chyba",
+ "Error occurred while updating comment with id {id}" : "Pri aktualizovaní komentára s id {id} nastala chyba",
+ "Error occurred while posting comment" : "Pri odosielaní komentára nastala chyba",
+ "_%n unread comment_::_%n unread comments_" : ["%n neprečítaný komentár","%n neprečítaných komentárov","%n neprečítaných komentárov"],
+ "Comment" : "Komentár",
+ "You commented" : "Komentovali ste",
+ "%1$s commented" : "%1$s komentoval",
+ "{author} commented" : "{author} komentoval",
+ "You commented on %1$s" : "Komentovali ste %1$s",
+ "You commented on {file}" : "Komentovali ste {file}",
+ "%1$s commented on %2$s" : "%1$s komentoval %2$s",
+ "{author} commented on {file}" : "{author} komentoval {file}",
+ "<strong>Comments</strong> for files" : "<strong>Komentáre</strong> pre súbory",
+ "Type in a new comment..." : "Zadať nový komentár...",
+ "No other comments available" : "Žiadne ďalšie komentáre nie sú dostupné",
+ "More comments..." : "Ďalšie komentáre...",
+ "{count} unread comments" : "{count} neprečítaných komentárov"
},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/comments/l10n/sq.js b/apps/comments/l10n/sq.js
index 2297b7dd768..845b9e5cfb1 100644
--- a/apps/comments/l10n/sq.js
+++ b/apps/comments/l10n/sq.js
@@ -14,8 +14,9 @@ OC.L10N.register(
"Save" : "Ruaje",
"Allowed characters {count} of {max}" : "Shenja të lejuara {count} nga {max}",
"Error occurred while retrieving comment with id {id}" : "Ndodhi një gabim teksa merrej komenti me id{id}",
- "Error occurred while updating comment with id {id}" : "Ndodhi një gabim teksa përditësohej komenti me id{id}",
+ "Error occurred while updating comment with id {id}" : "Ndodhi një gabim teksa përditësohej komenti me id {id}",
"Error occurred while posting comment" : "Ndodhi një gabim teksa postohej komenti",
+ "_%n unread comment_::_%n unread comments_" : ["%n komente të palexuara","%n komente të palexuara "],
"Comment" : "Koment",
"You commented" : "Komentuat",
"%1$s commented" : "%1$s komentoi",
@@ -23,8 +24,12 @@ OC.L10N.register(
"You commented on %1$s" : "Ju komentuat në %1$s",
"You commented on {file}" : "Ju komentuat në {file}",
"%1$s commented on %2$s" : "%1$s komentoi te %2$s",
- "{author} commented on {file}" : "{autori} komentoj në {file}",
- "<strong>Comments</strong> for files" : "<strong>Komente</strong> për file-et",
+ "{author} commented on {file}" : "{author} komentoi në {file}",
+ "<strong>Comments</strong> for files" : "<strong>Komente</strong> për skedarët",
+ "A (now) deleted user mentioned you in a comment on “%s”" : "Një përdorues i fshirë (tani) ju ka përmendur në një koment në \"%s\"",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "Një përdorues i fshirë (tani) ju ka përmendur në një koment në “{file}”",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s ju ka përmendur në një koment në “%2$s”",
+ "{user} mentioned you in a comment on “{file}”" : "{user} ju ka përmendur në një koment në “{file}”",
"Type in a new comment..." : "Shtypni një koment të ri…",
"No other comments available" : "S’ka komente të tjera",
"More comments..." : "Më tepër komente…",
diff --git a/apps/comments/l10n/sq.json b/apps/comments/l10n/sq.json
index 98d68f922a1..9b0eab39905 100644
--- a/apps/comments/l10n/sq.json
+++ b/apps/comments/l10n/sq.json
@@ -12,8 +12,9 @@
"Save" : "Ruaje",
"Allowed characters {count} of {max}" : "Shenja të lejuara {count} nga {max}",
"Error occurred while retrieving comment with id {id}" : "Ndodhi një gabim teksa merrej komenti me id{id}",
- "Error occurred while updating comment with id {id}" : "Ndodhi një gabim teksa përditësohej komenti me id{id}",
+ "Error occurred while updating comment with id {id}" : "Ndodhi një gabim teksa përditësohej komenti me id {id}",
"Error occurred while posting comment" : "Ndodhi një gabim teksa postohej komenti",
+ "_%n unread comment_::_%n unread comments_" : ["%n komente të palexuara","%n komente të palexuara "],
"Comment" : "Koment",
"You commented" : "Komentuat",
"%1$s commented" : "%1$s komentoi",
@@ -21,8 +22,12 @@
"You commented on %1$s" : "Ju komentuat në %1$s",
"You commented on {file}" : "Ju komentuat në {file}",
"%1$s commented on %2$s" : "%1$s komentoi te %2$s",
- "{author} commented on {file}" : "{autori} komentoj në {file}",
- "<strong>Comments</strong> for files" : "<strong>Komente</strong> për file-et",
+ "{author} commented on {file}" : "{author} komentoi në {file}",
+ "<strong>Comments</strong> for files" : "<strong>Komente</strong> për skedarët",
+ "A (now) deleted user mentioned you in a comment on “%s”" : "Një përdorues i fshirë (tani) ju ka përmendur në një koment në \"%s\"",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "Një përdorues i fshirë (tani) ju ka përmendur në një koment në “{file}”",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s ju ka përmendur në një koment në “%2$s”",
+ "{user} mentioned you in a comment on “{file}”" : "{user} ju ka përmendur në një koment në “{file}”",
"Type in a new comment..." : "Shtypni një koment të ri…",
"No other comments available" : "S’ka komente të tjera",
"More comments..." : "Më tepër komente…",
diff --git a/apps/comments/l10n/sv.js b/apps/comments/l10n/sv.js
index 72b91da0fbe..1f66e311e75 100644
--- a/apps/comments/l10n/sv.js
+++ b/apps/comments/l10n/sv.js
@@ -1,23 +1,39 @@
OC.L10N.register(
"comments",
{
- "Type in a new comment..." : "Skriv en ny kommentar",
+ "Comments" : "Kommentarer",
+ "Unknown user" : "Okänd användare",
+ "New comment …" : "Ny kommentar ...",
"Delete comment" : "Radera kommentar",
"Post" : "Skicka",
"Cancel" : "Avbryt",
"Edit comment" : "Redigera kommentar",
"[Deleted user]" : "[Raderad användare]",
- "Comments" : "Kommentarer",
- "No other comments available" : "Inga andra kommentarer tillgängliga",
- "More comments..." : "Fler kommentarter,,,",
+ "No comments yet, start the conversation!" : "Inga kommentarer ännu.",
+ "More comments …" : "Fler kommentarer ...",
"Save" : "Spara",
- "Allowed characters {count} of {max}" : "Tillåtet antal tecken {count} av {max}",
- "{count} unread comments" : "{count} olästa kommentarer",
+ "Allowed characters {count} of {max}" : "Antal tillåtna tecken, {count} av {max}",
+ "Error occurred while retrieving comment with id {id}" : "Fel inträffade vid inläsning av kommentar med id {id}",
+ "Error occurred while updating comment with id {id}" : "Fel inträffade vid uppdatering av kommentar med id {id}",
+ "Error occurred while posting comment" : "Fel inträffade vid publicering av kommentar",
+ "_%n unread comment_::_%n unread comments_" : ["%n oläst kommentar","%n olästa kommentarer"],
"Comment" : "Kommentar",
- "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentarer</strong> för filer <em>(listad alltid i flödet)</em>",
"You commented" : "Du kommenterade",
- "%1$s commented" : "%1$s har kommenterat",
- "You commented on %2$s" : "Du kommenterade %2$s",
- "%1$s commented on %2$s" : "%1$s kommenterade på %2$s"
+ "%1$s commented" : "%1$s kommenterade",
+ "{author} commented" : "{author} kommenterade",
+ "You commented on %1$s" : "Du kommenterade på %1$s",
+ "You commented on {file}" : "Du kommenterade på {file}",
+ "%1$s commented on %2$s" : "%1$s kommenterade på %2$s",
+ "{author} commented on {file}" : "{author} kommenterade på {file}",
+ "<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> för filer",
+ "A (now) deleted user mentioned you in a comment on “%s”" : "En (nu) raderad användare nämnde dig i en kommentar på \"%s\"",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "En (nu) raderad användare nämnde dig i en kommentar på \"{file}\"",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s nämnde dig i en kommentar på “%2$s”",
+ "{user} mentioned you in a comment on “{file}”" : "{user} nämnde dig i en kommentar på \"{file}\"",
+ "Type in a new comment..." : "Skriv en ny kommentar...",
+ "No other comments available" : "Inga andra kommentarer tillgängliga",
+ "More comments..." : "Fler kommentarer...",
+ "{count} unread comments" : "{count} olästa kommentarer",
+ "You commented on %2$s" : "Du kommenterade %2$s"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/comments/l10n/sv.json b/apps/comments/l10n/sv.json
index f078ea0e120..696e8f3a078 100644
--- a/apps/comments/l10n/sv.json
+++ b/apps/comments/l10n/sv.json
@@ -1,21 +1,37 @@
{ "translations": {
- "Type in a new comment..." : "Skriv en ny kommentar",
+ "Comments" : "Kommentarer",
+ "Unknown user" : "Okänd användare",
+ "New comment …" : "Ny kommentar ...",
"Delete comment" : "Radera kommentar",
"Post" : "Skicka",
"Cancel" : "Avbryt",
"Edit comment" : "Redigera kommentar",
"[Deleted user]" : "[Raderad användare]",
- "Comments" : "Kommentarer",
- "No other comments available" : "Inga andra kommentarer tillgängliga",
- "More comments..." : "Fler kommentarter,,,",
+ "No comments yet, start the conversation!" : "Inga kommentarer ännu.",
+ "More comments …" : "Fler kommentarer ...",
"Save" : "Spara",
- "Allowed characters {count} of {max}" : "Tillåtet antal tecken {count} av {max}",
- "{count} unread comments" : "{count} olästa kommentarer",
+ "Allowed characters {count} of {max}" : "Antal tillåtna tecken, {count} av {max}",
+ "Error occurred while retrieving comment with id {id}" : "Fel inträffade vid inläsning av kommentar med id {id}",
+ "Error occurred while updating comment with id {id}" : "Fel inträffade vid uppdatering av kommentar med id {id}",
+ "Error occurred while posting comment" : "Fel inträffade vid publicering av kommentar",
+ "_%n unread comment_::_%n unread comments_" : ["%n oläst kommentar","%n olästa kommentarer"],
"Comment" : "Kommentar",
- "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentarer</strong> för filer <em>(listad alltid i flödet)</em>",
"You commented" : "Du kommenterade",
- "%1$s commented" : "%1$s har kommenterat",
- "You commented on %2$s" : "Du kommenterade %2$s",
- "%1$s commented on %2$s" : "%1$s kommenterade på %2$s"
+ "%1$s commented" : "%1$s kommenterade",
+ "{author} commented" : "{author} kommenterade",
+ "You commented on %1$s" : "Du kommenterade på %1$s",
+ "You commented on {file}" : "Du kommenterade på {file}",
+ "%1$s commented on %2$s" : "%1$s kommenterade på %2$s",
+ "{author} commented on {file}" : "{author} kommenterade på {file}",
+ "<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> för filer",
+ "A (now) deleted user mentioned you in a comment on “%s”" : "En (nu) raderad användare nämnde dig i en kommentar på \"%s\"",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "En (nu) raderad användare nämnde dig i en kommentar på \"{file}\"",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s nämnde dig i en kommentar på “%2$s”",
+ "{user} mentioned you in a comment on “{file}”" : "{user} nämnde dig i en kommentar på \"{file}\"",
+ "Type in a new comment..." : "Skriv en ny kommentar...",
+ "No other comments available" : "Inga andra kommentarer tillgängliga",
+ "More comments..." : "Fler kommentarer...",
+ "{count} unread comments" : "{count} olästa kommentarer",
+ "You commented on %2$s" : "Du kommenterade %2$s"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/comments/l10n/zh_CN.js b/apps/comments/l10n/zh_CN.js
index 326fa6407a4..9a459c92b6e 100644
--- a/apps/comments/l10n/zh_CN.js
+++ b/apps/comments/l10n/zh_CN.js
@@ -1,23 +1,39 @@
OC.L10N.register(
"comments",
{
- "Type in a new comment..." : "添加新评论...",
+ "Comments" : "评论",
+ "Unknown user" : "未知用户",
+ "New comment …" : "新评论 ...",
"Delete comment" : "删除评论",
"Post" : "发布",
"Cancel" : "取消",
"Edit comment" : "编辑评论",
- "[Deleted user]" : "[Deleted user]",
- "Comments" : "评论",
- "No other comments available" : "没有其他评论",
- "More comments..." : "更多评论...",
+ "[Deleted user]" : "[已删除用户]",
+ "No comments yet, start the conversation!" : "还没有评论，开始对话吧！",
+ "More comments …" : "更多评论 ...",
"Save" : "保存",
"Allowed characters {count} of {max}" : "当前字数： {count}，最大允许：{max}",
- "{count} unread comments" : "{count} 条未读评论",
+ "Error occurred while retrieving comment with id {id}" : "检索 id 为 {id} 的评论出错",
+ "Error occurred while updating comment with id {id}" : "更新 id 为 {id} 的评论出错",
+ "Error occurred while posting comment" : "发布评论出错",
+ "_%n unread comment_::_%n unread comments_" : ["%n 未读评论"],
"Comment" : "评论",
- "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "文件的<strong>评论</strong><em>(始终在数据流中列出)</em>",
"You commented" : "您的评论",
"%1$s commented" : "%1$s 已评论",
- "You commented on %2$s" : "你评论了 %2$s",
- "%1$s commented on %2$s" : "%1$s 评论了 %2$s"
+ "{author} commented" : "{author} 评论了",
+ "You commented on %1$s" : "您在 %1$s 的评论",
+ "You commented on {file}" : "您对 {file} 的评论",
+ "%1$s commented on %2$s" : "%1$s 评论了 %2$s",
+ "{author} commented on {file}" : "{author} 对 {file} 的评论",
+ "<strong>Comments</strong> for files" : "文件的<strong>评论</strong>",
+ "A (now) deleted user mentioned you in a comment on “%s”" : "一个(已)被删除的用户在 “%s” 的评论中提到了您",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "一个(已)被删除的用户在 “{file}” 的评论中提到了您",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s 在 “%2$s” 的评论中提到了您",
+ "{user} mentioned you in a comment on “{file}”" : "{user} 在 “{file}” 的评论中提到了您",
+ "Type in a new comment..." : "添加新评论...",
+ "No other comments available" : "没有其他评论",
+ "More comments..." : "更多评论...",
+ "{count} unread comments" : "{count} 条未读评论",
+ "You commented on %2$s" : "您评论了 %2$s"
},
"nplurals=1; plural=0;");
diff --git a/apps/comments/l10n/zh_CN.json b/apps/comments/l10n/zh_CN.json
index 98aa243e1c2..be867c5b856 100644
--- a/apps/comments/l10n/zh_CN.json
+++ b/apps/comments/l10n/zh_CN.json
@@ -1,21 +1,37 @@
{ "translations": {
- "Type in a new comment..." : "添加新评论...",
+ "Comments" : "评论",
+ "Unknown user" : "未知用户",
+ "New comment …" : "新评论 ...",
"Delete comment" : "删除评论",
"Post" : "发布",
"Cancel" : "取消",
"Edit comment" : "编辑评论",
- "[Deleted user]" : "[Deleted user]",
- "Comments" : "评论",
- "No other comments available" : "没有其他评论",
- "More comments..." : "更多评论...",
+ "[Deleted user]" : "[已删除用户]",
+ "No comments yet, start the conversation!" : "还没有评论，开始对话吧！",
+ "More comments …" : "更多评论 ...",
"Save" : "保存",
"Allowed characters {count} of {max}" : "当前字数： {count}，最大允许：{max}",
- "{count} unread comments" : "{count} 条未读评论",
+ "Error occurred while retrieving comment with id {id}" : "检索 id 为 {id} 的评论出错",
+ "Error occurred while updating comment with id {id}" : "更新 id 为 {id} 的评论出错",
+ "Error occurred while posting comment" : "发布评论出错",
+ "_%n unread comment_::_%n unread comments_" : ["%n 未读评论"],
"Comment" : "评论",
- "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "文件的<strong>评论</strong><em>(始终在数据流中列出)</em>",
"You commented" : "您的评论",
"%1$s commented" : "%1$s 已评论",
- "You commented on %2$s" : "你评论了 %2$s",
- "%1$s commented on %2$s" : "%1$s 评论了 %2$s"
+ "{author} commented" : "{author} 评论了",
+ "You commented on %1$s" : "您在 %1$s 的评论",
+ "You commented on {file}" : "您对 {file} 的评论",
+ "%1$s commented on %2$s" : "%1$s 评论了 %2$s",
+ "{author} commented on {file}" : "{author} 对 {file} 的评论",
+ "<strong>Comments</strong> for files" : "文件的<strong>评论</strong>",
+ "A (now) deleted user mentioned you in a comment on “%s”" : "一个(已)被删除的用户在 “%s” 的评论中提到了您",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "一个(已)被删除的用户在 “{file}” 的评论中提到了您",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s 在 “%2$s” 的评论中提到了您",
+ "{user} mentioned you in a comment on “{file}”" : "{user} 在 “{file}” 的评论中提到了您",
+ "Type in a new comment..." : "添加新评论...",
+ "No other comments available" : "没有其他评论",
+ "More comments..." : "更多评论...",
+ "{count} unread comments" : "{count} 条未读评论",
+ "You commented on %2$s" : "您评论了 %2$s"
},"pluralForm" :"nplurals=1; plural=0;"
} \ No newline at end of file
diff --git a/apps/comments/lib/Activity/Provider.php b/apps/comments/lib/Activity/Provider.php
index 170b20d7c27..c55982827b3 100644
--- a/apps/comments/lib/Activity/Provider.php
+++ b/apps/comments/lib/Activity/Provider.php
@@ -206,7 +206,7 @@ class Provider implements IProvider {
'type' => 'file',
'id' => $id,
'name' => basename($path),
- 'path' => $path,
+ 'path' => trim($path, '/'),
'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
];
}
diff --git a/apps/comments/lib/Notification/Listener.php b/apps/comments/lib/Notification/Listener.php
index d30c59c93d5..365f93ce8dd 100644
--- a/apps/comments/lib/Notification/Listener.php
+++ b/apps/comments/lib/Notification/Listener.php
@@ -23,7 +23,6 @@ namespace OCA\Comments\Notification;
use OCP\Comments\CommentsEvent;
use OCP\Comments\IComment;
-use OCP\IURLGenerator;
use OCP\IUserManager;
use OCP\Notification\IManager;
@@ -34,25 +33,19 @@ class Listener {
/** @var IUserManager */
protected $userManager;
- /** @var IURLGenerator */
- protected $urlGenerator;
-
/**
* Listener constructor.
*
* @param IManager $notificationManager
* @param IUserManager $userManager
- * @param IURLGenerator $urlGenerator
*/
public function __construct(
IManager $notificationManager,
- IUserManager $userManager,
- IURLGenerator $urlGenerator
+ IUserManager $userManager
) {
$this->notificationManager = $notificationManager;
$this->userManager = $userManager;
- $this->urlGenerator = $urlGenerator;
}
/**
@@ -100,11 +93,7 @@ class Listener {
->setApp('comments')
->setObject('comment', $comment->getId())
->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ])
- ->setDateTime($comment->getCreationDateTime())
- ->setLink($this->urlGenerator->linkToRouteAbsolute(
- 'comments.Notifications.view',
- ['id' => $comment->getId()])
- );
+ ->setDateTime($comment->getCreationDateTime());
return $notification;
}
diff --git a/apps/comments/lib/Notification/Notifier.php b/apps/comments/lib/Notification/Notifier.php
index 170538512d8..a9daef3031f 100644
--- a/apps/comments/lib/Notification/Notifier.php
+++ b/apps/comments/lib/Notification/Notifier.php
@@ -139,7 +139,11 @@ class Notifier implements INotifier {
]
);
}
- $notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')));
+ $notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')))
+ ->setLink($this->url->linkToRouteAbsolute(
+ 'comments.Notifications.view',
+ ['id' => $comment->getId()])
+ );
return $notification;
break;
diff --git a/apps/comments/tests/Unit/Notification/ListenerTest.php b/apps/comments/tests/Unit/Notification/ListenerTest.php
index 3007b78cb3d..ef84d1c60de 100644
--- a/apps/comments/tests/Unit/Notification/ListenerTest.php
+++ b/apps/comments/tests/Unit/Notification/ListenerTest.php
@@ -46,14 +46,12 @@ class ListenerTest extends TestCase {
protected function setUp() {
parent::setUp();
- $this->notificationManager = $this->getMockBuilder('\OCP\Notification\IManager')->getMock();
- $this->userManager = $this->getMockBuilder('\OCP\IUserManager')->getMock();
- $this->urlGenerator = $this->getMockBuilder('OCP\IURLGenerator')->getMock();
+ $this->notificationManager = $this->createMock(\OCP\Notification\IManager::class);
+ $this->userManager = $this->createMock(\OCP\IUserManager::class);
$this->listener = new Listener(
$this->notificationManager,
- $this->userManager,
- $this->urlGenerator
+ $this->userManager
);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-25 08:21:43 +0000