Bugfix/8387

.drone.yml

@@ -46,10 +46,10 @@ pipeline:
       matrix:
         TESTS: syntax-php7.1
   phan:
-    image: nextcloudci/php7.1:php7.1-15
+    image: nextcloudci/php7.2:php7.2-11
     commands:
       - composer install
-      - composer require --dev "phan/phan:dev-master"
+      - composer require --dev "phan/phan:0.11.1"
       - ./lib/composer/phan/phan/phan -k build/.phan/config.php
       - php ./build/.phan/plugin-checker.php
     when:
@@ -615,6 +615,13 @@ pipeline:
       when:
         matrix:
           TESTS-ACCEPTANCE: access-levels
+  acceptance-app-comments:
+      image: nextcloudci/integration-php7.0:integration-php7.0-6
+      commands:
+        - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-comments --selenium-server selenium:4444 allow-git-repository-modifications features/app-comments.feature
+      when:
+        matrix:
+          TESTS-ACCEPTANCE: app-comments
   acceptance-app-files:
       image: nextcloudci/integration-php7.0:integration-php7.0-6
       commands:
@@ -813,6 +820,8 @@ matrix:
     - TESTS: integration-remote-api
     - TESTS: acceptance
       TESTS-ACCEPTANCE: access-levels
+    - TESTS: acceptance
+      TESTS-ACCEPTANCE: app-comments
     - TESTS: acceptance
       TESTS-ACCEPTANCE: app-files
     - TESTS: acceptance

.gitignore

@@ -8,6 +8,8 @@
 /apps/inc.php
 /assets
 /.htaccess
+/translationfiles
+/translationtool.phar
 
 # ignore all apps except core ones
 /apps*/*

.htaccess

@@ -63,7 +63,7 @@
   RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L]
   RewriteRule ^remote/(.*) remote.php [QSA,L]
   RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
-  RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.*
+  RewriteCond %{REQUEST_URI} !^/.well-known/(acme-challenge|pki-validation)/.*
   RewriteRule ^(?:\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 </IfModule>
 <IfModule mod_mime.c>

.tx/config

@@ -0,0 +1,129 @@
+[main]
+host = https://www.transifex.com
+lang_map = bg_BG: bg, cs_CZ: cs, fi_FI: fi, hu_HU: hu, nb_NO: nb, sk_SK: sk, th_TH: th, ja_JP: ja
+
+[nextcloud.core]
+file_filter = translationfiles/<lang>/core.po
+source_file = translationfiles/templates/core.pot
+source_lang = en
+type = PO
+
+[nextcloud.files]
+file_filter = translationfiles/<lang>/files.po
+source_file = translationfiles/templates/files.pot
+source_lang = en
+type = PO
+
+[nextcloud.settings-1]
+file_filter = translationfiles/<lang>/settings.po
+source_file = translationfiles/templates/settings.pot
+source_lang = en
+type = PO
+
+[nextcloud.lib]
+file_filter = translationfiles/<lang>/lib.po
+source_file = translationfiles/templates/lib.pot
+source_lang = en
+type = PO
+
+[nextcloud.dav]
+file_filter = translationfiles/<lang>/dav.po
+source_file = translationfiles/templates/dav.pot
+source_lang = en
+type = PO
+
+[nextcloud.files_encryption]
+file_filter = translationfiles/<lang>/encryption.po
+source_file = translationfiles/templates/encryption.pot
+source_lang = en
+type = PO
+
+[nextcloud.files_external]
+file_filter = translationfiles/<lang>/files_external.po
+source_file = translationfiles/templates/files_external.pot
+source_lang = en
+type = PO
+
+[nextcloud.files_sharing]
+file_filter = translationfiles/<lang>/files_sharing.po
+source_file = translationfiles/templates/files_sharing.pot
+source_lang = en
+type = PO
+
+[nextcloud.files_trashbin]
+file_filter = translationfiles/<lang>/files_trashbin.po
+source_file = translationfiles/templates/files_trashbin.pot
+source_lang = en
+type = PO
+
+[nextcloud.files_versions]
+file_filter = translationfiles/<lang>/files_versions.po
+source_file = translationfiles/templates/files_versions.pot
+source_lang = en
+type = PO
+
+[nextcloud.user_ldap]
+file_filter = translationfiles/<lang>/user_ldap.po
+source_file = translationfiles/templates/user_ldap.pot
+source_lang = en
+type = PO
+
+[nextcloud.comments]
+file_filter = translationfiles/<lang>/comments.po
+source_file = translationfiles/templates/comments.pot
+source_lang = en
+type = PO
+
+[nextcloud.federatedfilesharing]
+file_filter = translationfiles/<lang>/federatedfilesharing.po
+source_file = translationfiles/templates/federatedfilesharing.pot
+source_lang = en
+type = PO
+
+[nextcloud.federation]
+file_filter = translationfiles/<lang>/federation.po
+source_file = translationfiles/templates/federation.pot
+source_lang = en
+type = PO
+
+[nextcloud.oauth2]
+file_filter = translationfiles/<lang>/oauth2.po
+source_file = translationfiles/templates/oauth2.pot
+source_lang = en
+type = PO
+
+[nextcloud.sharebymail]
+file_filter = translationfiles/<lang>/sharebymail.po
+source_file = translationfiles/templates/sharebymail.pot
+source_lang = en
+type = PO
+
+[nextcloud.systemtags]
+file_filter = translationfiles/<lang>/systemtags.po
+source_file = translationfiles/templates/systemtags.pot
+source_lang = en
+type = PO
+
+[nextcloud.updatenotification]
+file_filter = translationfiles/<lang>/updatenotification.po
+source_file = translationfiles/templates/updatenotification.pot
+source_lang = en
+type = PO
+
+[nextcloud.theming]
+file_filter = translationfiles/<lang>/theming.po
+source_file = translationfiles/templates/theming.pot
+source_lang = en
+type = PO
+
+[nextcloud.twofactor_backupcodes]
+file_filter = translationfiles/<lang>/twofactor_backupcodes.po
+source_file = translationfiles/templates/twofactor_backupcodes.pot
+source_lang = en
+type = PO
+
+[nextcloud.workflowengine]
+file_filter = translationfiles/<lang>/workflowengine.po
+source_file = translationfiles/templates/workflowengine.pot
+source_lang = en
+type = PO

apps/comments/js/commentstabview.js

@@ -586,7 +586,7 @@
 					$submit.prop('disabled', false);
 					$cancel.prop('disabled', false);
 
-					OC.Notification.showTemporary(t('comments', 'Error occurred while retrieving comment with id {id}', {id: commentId}));
+					OC.Notification.showTemporary(t('comments', 'Error occurred while retrieving comment with ID {id}', {id: commentId}));
 				}
 			});
 

apps/comments/l10n/af.js

@@ -12,7 +12,7 @@ OC.L10N.register(
     "More comments …" : "Nog kommentare …",
     "Save" : "Bewaar",
     "Allowed characters {count} of {max}" : "Toegelate karakters {telling} van {maks}",
-    "Error occurred while retrieving comment with id {id}" : "’n Fout het voorgekom toe kommentaar met id {id} opgehaal is",
+    "Error occurred while retrieving comment with ID {id}" : "’n Fout het voorgekom toe kommentaar met id {id} opgehaal is",
     "Error occurred while updating comment with id {id}" : "’n Fout het voorgekom toe kommentaar met id {id} bygewerk is",
     "Error occurred while posting comment" : "’n Fout het voorgekom toe kommentaar geplaas is",
     "_%n unread comment_::_%n unread comments_" : ["%n ongeleesde kommentaar","%n ongeleeste kommentare"],
@@ -25,6 +25,8 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s het op %2$s kommentaar gelewer",
     "{author} commented on {file}" : "{outeur} het op {lêer} kommentaar gelewer",
     "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> vir lêers",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Jy was genoem op \"%s\", in die kommentaar van 'n gebruiker wat intussen geskrap is.",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Jy was genoem op “{lêer}”, in die kommentaar van 'n gebruiker wat intussen geskrap is.",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in ’n kommentaar op “%2$s” genoem",
     "{user} mentioned you in a comment on “{file}”" : "{gebruiker} het u in ’n kommentaar oor “{lêer}” genoem",
     "Unknown user" : "Onbekende gebruiker",

apps/comments/l10n/af.json

@@ -10,7 +10,7 @@
     "More comments …" : "Nog kommentare …",
     "Save" : "Bewaar",
     "Allowed characters {count} of {max}" : "Toegelate karakters {telling} van {maks}",
-    "Error occurred while retrieving comment with id {id}" : "’n Fout het voorgekom toe kommentaar met id {id} opgehaal is",
+    "Error occurred while retrieving comment with ID {id}" : "’n Fout het voorgekom toe kommentaar met id {id} opgehaal is",
     "Error occurred while updating comment with id {id}" : "’n Fout het voorgekom toe kommentaar met id {id} bygewerk is",
     "Error occurred while posting comment" : "’n Fout het voorgekom toe kommentaar geplaas is",
     "_%n unread comment_::_%n unread comments_" : ["%n ongeleesde kommentaar","%n ongeleeste kommentare"],
@@ -23,6 +23,8 @@
     "%1$s commented on %2$s" : "%1$s het op %2$s kommentaar gelewer",
     "{author} commented on {file}" : "{outeur} het op {lêer} kommentaar gelewer",
     "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> vir lêers",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Jy was genoem op \"%s\", in die kommentaar van 'n gebruiker wat intussen geskrap is.",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Jy was genoem op “{lêer}”, in die kommentaar van 'n gebruiker wat intussen geskrap is.",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in ’n kommentaar op “%2$s” genoem",
     "{user} mentioned you in a comment on “{file}”" : "{gebruiker} het u in ’n kommentaar oor “{lêer}” genoem",
     "Unknown user" : "Onbekende gebruiker",

apps/comments/l10n/ar.js

@@ -2,7 +2,6 @@ OC.L10N.register(
     "comments",
     {
     "Comments" : "تعليقات",
-    "Unknown user" : "مستخدم غير معروف",
     "New comment …" : "تعليق جديد",
     "Delete comment" : "حذف التعليق",
     "Post" : "ارسال",
@@ -13,7 +12,6 @@ OC.L10N.register(
     "More comments …" : "مزيد من التعليقات...",
     "Save" : "حفظ",
     "Allowed characters {count} of {max}" : "عدد الأحرف المسموح بها {count} من {max}",
-    "Error occurred while retrieving comment with id {id}" : "حصل خطأ أثناء عرض التعليق رقم {id}",
     "Error occurred while updating comment with id {id}" : "حصل خطأ أثناء تعديل التعليق رقم {id}",
     "Error occurred while posting comment" : "حصل خطأ أثناء إرسال التعليق",
     "Comment" : "تعليق",
@@ -22,6 +20,7 @@ OC.L10N.register(
     "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> على الملفات"
+    "<strong>Comments</strong> for files" : "<strong>تعليقات</strong> على الملفات",
+    "Unknown user" : "مستخدم غير معروف"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");

apps/comments/l10n/ar.json

@@ -1,6 +1,5 @@
 { "translations": {
     "Comments" : "تعليقات",
-    "Unknown user" : "مستخدم غير معروف",
     "New comment …" : "تعليق جديد",
     "Delete comment" : "حذف التعليق",
     "Post" : "ارسال",
@@ -11,7 +10,6 @@
     "More comments …" : "مزيد من التعليقات...",
     "Save" : "حفظ",
     "Allowed characters {count} of {max}" : "عدد الأحرف المسموح بها {count} من {max}",
-    "Error occurred while retrieving comment with id {id}" : "حصل خطأ أثناء عرض التعليق رقم {id}",
     "Error occurred while updating comment with id {id}" : "حصل خطأ أثناء تعديل التعليق رقم {id}",
     "Error occurred while posting comment" : "حصل خطأ أثناء إرسال التعليق",
     "Comment" : "تعليق",
@@ -20,6 +18,7 @@
     "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> على الملفات"
+    "<strong>Comments</strong> for files" : "<strong>تعليقات</strong> على الملفات",
+    "Unknown user" : "مستخدم غير معروف"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }

apps/comments/l10n/ast.js

@@ -12,7 +12,6 @@ OC.L10N.register(
     "More comments …" : "Más comentarios...",
     "Save" : "Guardar",
     "Allowed characters {count} of {max}" : "{count} caráuteres almitíos de {max}",
-    "Error occurred while retrieving comment with id {id}" : "Asocedió un fallu entrín se recibía'l comentariu cola ID {id}",
     "Error occurred while updating comment with id {id}" : "Asocedió un fallu entrín s'anovaba'l comentariu cola ID {id}",
     "Error occurred while posting comment" : "Asocedieron fallos entrín s'espublizaba'l comentariu",
     "_%n unread comment_::_%n unread comments_" : ["%n comentariu ensin lleer","%n comentarios ensin lleer"],

apps/comments/l10n/ast.json

@@ -10,7 +10,6 @@
     "More comments …" : "Más comentarios...",
     "Save" : "Guardar",
     "Allowed characters {count} of {max}" : "{count} caráuteres almitíos de {max}",
-    "Error occurred while retrieving comment with id {id}" : "Asocedió un fallu entrín se recibía'l comentariu cola ID {id}",
     "Error occurred while updating comment with id {id}" : "Asocedió un fallu entrín s'anovaba'l comentariu cola ID {id}",
     "Error occurred while posting comment" : "Asocedieron fallos entrín s'espublizaba'l comentariu",
     "_%n unread comment_::_%n unread comments_" : ["%n comentariu ensin lleer","%n comentarios ensin lleer"],

apps/comments/l10n/bg.js

@@ -12,7 +12,6 @@ OC.L10N.register(
     "More comments …" : "Още коментари...",
     "Save" : "Запазване",
     "Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
-    "Error occurred while retrieving comment with id {id}" : "Възникна грешка по време на извличане на коментар с код {id}",
     "Error occurred while updating comment with id {id}" : "Възникна грешка по време на обновяване на коментар с код {id}",
     "Error occurred while posting comment" : "Възникна грешка по време на изпращане на коментар",
     "_%n unread comment_::_%n unread comments_" : ["%n непрочетен коментар","%n непрочетени коментари"],
@@ -25,6 +24,8 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s коментиран за %2$s",
     "{author} commented on {file}" : "{author} коментира за {file}",
     "<strong>Comments</strong> for files" : "<strong>Коментари</strong> за файлове",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Бяхте споменат/а на “%s”, в коментар от потребител, който вече е изтрит",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Бяхте споменат/а към “{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}”",
     "Unknown user" : "Непознат потребител",

apps/comments/l10n/bg.json

@@ -10,7 +10,6 @@
     "More comments …" : "Още коментари...",
     "Save" : "Запазване",
     "Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
-    "Error occurred while retrieving comment with id {id}" : "Възникна грешка по време на извличане на коментар с код {id}",
     "Error occurred while updating comment with id {id}" : "Възникна грешка по време на обновяване на коментар с код {id}",
     "Error occurred while posting comment" : "Възникна грешка по време на изпращане на коментар",
     "_%n unread comment_::_%n unread comments_" : ["%n непрочетен коментар","%n непрочетени коментари"],
@@ -23,6 +22,8 @@
     "%1$s commented on %2$s" : "%1$s коментиран за %2$s",
     "{author} commented on {file}" : "{author} коментира за {file}",
     "<strong>Comments</strong> for files" : "<strong>Коментари</strong> за файлове",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Бяхте споменат/а на “%s”, в коментар от потребител, който вече е изтрит",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Бяхте споменат/а към “{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}”",
     "Unknown user" : "Непознат потребител",

apps/comments/l10n/ca.js

@@ -12,7 +12,6 @@ OC.L10N.register(
     "More comments …" : "Més comentaris...",
     "Save" : "Desa",
     "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"],
@@ -25,6 +24,8 @@ OC.L10N.register(
     "%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",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Has estat mencionat a \"%s\" en un comentari d'un usuari que ja no existeix",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Has estat mencionat a \"{file}\" en un comentari d'un usuari que ja no existeix",
     "%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}”",
     "Unknown user" : "Usuari desconegut",

apps/comments/l10n/ca.json

@@ -10,7 +10,6 @@
     "More comments …" : "Més comentaris...",
     "Save" : "Desa",
     "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"],
@@ -23,6 +22,8 @@
     "%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",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Has estat mencionat a \"%s\" en un comentari d'un usuari que ja no existeix",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Has estat mencionat a \"{file}\" en un comentari d'un usuari que ja no existeix",
     "%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}”",
     "Unknown user" : "Usuari desconegut",