From 2656aeaf9cb8482e22055e9c6788fd1593ff3744 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 8 Aug 2015 15:18:34 -0700 Subject: [PATCH 1/2] ensure diaspora_signature is converted to json before we store it. --- include/items.php | 3 +++ util/messages.po | 24 ++++++++++++++---------- version.inc | 2 +- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/include/items.php b/include/items.php index 1551a069a..01b4a3460 100755 --- a/include/items.php +++ b/include/items.php @@ -866,6 +866,9 @@ function get_item_elements($x) { $arr['sig'] = (($x['signature']) ? htmlspecialchars($x['signature'], ENT_COMPAT,'UTF-8',false) : ''); + if(array_key_exists('diaspora_signature',$x) && is_array($x['diaspora_signature'])) + $x['diaspora_signature'] = json_encode($x['diaspora_signature']); + $arr['diaspora_meta'] = (($x['diaspora_signature']) ? json_encode(crypto_encapsulate($x['diaspora_signature'],$key)) : ''); $arr['object'] = activity_sanitise($x['object']); $arr['target'] = activity_sanitise($x['target']); diff --git a/util/messages.po b/util/messages.po index d645321f7..949158f6d 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-07-31.1110\n" +"Project-Id-Version: 2015-08-07.1117\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-31 00:03-0700\n" +"POT-Creation-Date: 2015-08-07 00:03-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1019,7 +1019,7 @@ msgstr "" #: ../../include/RedDAV/RedBrowser.php:257 #: ../../include/RedDAV/RedBrowser.php:305 ../../mod/profile_photo.php:362 -#: ../../mod/events.php:493 ../../mod/photos.php:718 ../../mod/photos.php:1248 +#: ../../mod/photos.php:718 ../../mod/photos.php:1248 msgid "Upload" msgstr "" @@ -3037,14 +3037,14 @@ msgstr "" msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4209 ../../mod/thing.php:74 +#: ../../include/items.php:4215 ../../mod/thing.php:74 #: ../../mod/filestorage.php:27 ../../mod/viewsrc.php:20 #: ../../mod/admin.php:167 ../../mod/admin.php:1025 ../../mod/admin.php:1225 #: ../../mod/display.php:36 msgid "Item not found." msgstr "" -#: ../../include/items.php:4282 ../../include/attach.php:137 +#: ../../include/items.php:4288 ../../include/attach.php:137 #: ../../include/attach.php:184 ../../include/attach.php:247 #: ../../include/attach.php:261 ../../include/attach.php:305 #: ../../include/attach.php:319 ../../include/attach.php:350 @@ -3087,26 +3087,26 @@ msgstr "" msgid "Permission denied." msgstr "" -#: ../../include/items.php:4684 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4690 ../../mod/group.php:38 ../../mod/group.php:140 #: ../../mod/bulksetclose.php:51 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4700 +#: ../../include/items.php:4706 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4707 +#: ../../include/items.php:4713 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4717 ../../mod/connedit.php:662 +#: ../../include/items.php:4723 ../../mod/connedit.php:662 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4719 +#: ../../include/items.php:4725 msgid "Connection not found." msgstr "" @@ -4429,6 +4429,10 @@ msgstr "" msgid "Export" msgstr "" +#: ../../mod/events.php:493 +msgid "Import" +msgstr "" + #: ../../mod/events.php:518 msgid "Event removed" msgstr "" diff --git a/version.inc b/version.inc index a898bfc30..699013c51 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-08-06.1116 +2015-08-08.1118 From eae88b081534a407ae39297b6608911112f95666 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Sun, 9 Aug 2015 15:56:02 +0200 Subject: [PATCH 2/2] Update Dutch strings --- view/nl/messages.po | 26 +++++++++++++++----------- view/nl/strings.php | 3 ++- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/view/nl/messages.po b/view/nl/messages.po index 204ad6350..d58073cff 100644 --- a/view/nl/messages.po +++ b/view/nl/messages.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-31 00:03-0700\n" -"PO-Revision-Date: 2015-08-05 20:25+0000\n" +"POT-Creation-Date: 2015-08-07 00:03-0700\n" +"PO-Revision-Date: 2015-08-09 13:50+0000\n" "Last-Translator: jeroenpraat \n" "Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n" "MIME-Version: 1.0\n" @@ -1021,7 +1021,7 @@ msgstr "Aanmaken" #: ../../include/RedDAV/RedBrowser.php:257 #: ../../include/RedDAV/RedBrowser.php:305 ../../mod/profile_photo.php:362 -#: ../../mod/events.php:493 ../../mod/photos.php:718 ../../mod/photos.php:1248 +#: ../../mod/photos.php:718 ../../mod/photos.php:1248 msgid "Upload" msgstr "Uploaden" @@ -1281,7 +1281,7 @@ msgstr "Filter wat je in de Matrix ziet op hoe goed je iemand kent of mag" #: ../../include/features.php:74 msgid "Connection Filtering" -msgstr "Connectie-filters" +msgstr "berichtenfilters" #: ../../include/features.php:74 msgid "Filter incoming posts from connections based on keywords/content" @@ -3041,14 +3041,14 @@ msgstr "Voor alle goedgekeurde connecties zichtbaar." msgid "Visible to specific connections." msgstr "Voor specifieke connecties zichtbaar." -#: ../../include/items.php:4209 ../../mod/thing.php:74 +#: ../../include/items.php:4215 ../../mod/thing.php:74 #: ../../mod/filestorage.php:27 ../../mod/viewsrc.php:20 #: ../../mod/admin.php:167 ../../mod/admin.php:1025 ../../mod/admin.php:1225 #: ../../mod/display.php:36 msgid "Item not found." msgstr "Item niet gevonden." -#: ../../include/items.php:4282 ../../include/attach.php:137 +#: ../../include/items.php:4288 ../../include/attach.php:137 #: ../../include/attach.php:184 ../../include/attach.php:247 #: ../../include/attach.php:261 ../../include/attach.php:305 #: ../../include/attach.php:319 ../../include/attach.php:350 @@ -3091,26 +3091,26 @@ msgstr "Item niet gevonden." msgid "Permission denied." msgstr "Toegang geweigerd" -#: ../../include/items.php:4684 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4690 ../../mod/group.php:38 ../../mod/group.php:140 #: ../../mod/bulksetclose.php:51 msgid "Collection not found." msgstr "Collectie niet gevonden." -#: ../../include/items.php:4700 +#: ../../include/items.php:4706 msgid "Collection is empty." msgstr "Collectie is leeg" -#: ../../include/items.php:4707 +#: ../../include/items.php:4713 #, php-format msgid "Collection: %s" msgstr "Collectie: %s" -#: ../../include/items.php:4717 ../../mod/connedit.php:662 +#: ../../include/items.php:4723 ../../mod/connedit.php:662 #, php-format msgid "Connection: %s" msgstr "Connectie: %s" -#: ../../include/items.php:4719 +#: ../../include/items.php:4725 msgid "Connection not found." msgstr "Connectie niet gevonden." @@ -4433,6 +4433,10 @@ msgstr "Volgende" msgid "Export" msgstr "Exporteren" +#: ../../mod/events.php:493 +msgid "Import" +msgstr "Importeren" + #: ../../mod/events.php:518 msgid "Event removed" msgstr "Gebeurtenis verwijderd" diff --git a/view/nl/strings.php b/view/nl/strings.php index 020506ea7..625619f76 100644 --- a/view/nl/strings.php +++ b/view/nl/strings.php @@ -292,7 +292,7 @@ $a->strings["Network New Tab"] = "Nieuwe netwerktab"; $a->strings["Enable tab to display all new Network activity"] = "Laat de tab alle nieuwe netwerkactiviteit tonen"; $a->strings["Affinity Tool"] = "Verwantschapsfilter"; $a->strings["Filter stream activity by depth of relationships"] = "Filter wat je in de Matrix ziet op hoe goed je iemand kent of mag"; -$a->strings["Connection Filtering"] = "Connectie-filters"; +$a->strings["Connection Filtering"] = "berichtenfilters"; $a->strings["Filter incoming posts from connections based on keywords/content"] = "Filter binnenkomende berichten van connecties aan de hand van trefwoorden/inhoud"; $a->strings["Suggest Channels"] = "Kanalen voorstellen"; $a->strings["Show channel suggestions"] = "Voor jou mogelijk interessante kanalen voorstellen"; @@ -1046,6 +1046,7 @@ $a->strings["Create New Event"] = "Nieuwe gebeurtenis aanmaken"; $a->strings["Previous"] = "Vorige"; $a->strings["Next"] = "Volgende"; $a->strings["Export"] = "Exporteren"; +$a->strings["Import"] = "Importeren"; $a->strings["Event removed"] = "Gebeurtenis verwijderd"; $a->strings["Failed to remove event"] = "Verwijderen gebeurtenis mislukt"; $a->strings["Event details"] = "Details van gebeurtenis";