From 047c02371a2d232da7457c665bd28b651856577d Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 1 Jun 2018 22:12:35 +0000 Subject: [PATCH 1/3] Small corrections to the database descriptions --- src/Database/DBStructure.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php index c285528e0..45c98f0ed 100644 --- a/src/Database/DBStructure.php +++ b/src/Database/DBStructure.php @@ -1146,7 +1146,7 @@ class DBStructure "extid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "thr-parent" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "If the parent of this item is not the top-level item in the conversation, the uri of the immediate parent; otherwise set to parent-uri"], "created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Creation timestamp."], - "edited" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Date of last edit (default is created)"], + "edited" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Date of last edit (default is created)"], "commented" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Date of last comment/reply to this item"], "received" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "datetime"], "changed" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Date that something in the conversation changed, indicating clients should fetch the conversation again"], @@ -1168,7 +1168,7 @@ class DBStructure "target-type" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "ActivityStreams target type if applicable (URI)"], "target" => ["type" => "text", "comment" => "JSON encoded target structure if used"], "postopts" => ["type" => "text", "comment" => "External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery"], - "plink" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "permalink or URL toa displayable copy of the message at its source"], + "plink" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "permalink or URL to a displayable copy of the message at its source"], "resource-id" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => "Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type"], "event-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["event" => "id"], "comment" => "Used to link to the event.id"], "tag" => ["type" => "mediumtext", "comment" => ""], From a75d28e5211e36135c75cd2650b256d24c6abd3d Mon Sep 17 00:00:00 2001 From: AndyHee Date: Sat, 2 Jun 2018 11:23:27 +0700 Subject: [PATCH 2/3] Rewording label --- src/Object/Post.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Object/Post.php b/src/Object/Post.php index b47bbd69f..f26904dbc 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -184,7 +184,7 @@ class Post extends BaseObject } // Showing the one or the other text, depending upon if we can only hide it or really delete it. - $delete = $origin ? L10n::t('Delete') : L10n::t('Remove from your stream'); + $delete = $origin ? L10n::t('Delete') : L10n::t('Remove here'); $drop = [ 'dropping' => $dropping, From 2b25bd48d43117bb95ec77790f06aa61e61496e7 Mon Sep 17 00:00:00 2001 From: AndyHee Date: Sat, 2 Jun 2018 12:40:41 +0700 Subject: [PATCH 3/3] Improved distinction between delete and remove --- src/Object/Post.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Object/Post.php b/src/Object/Post.php index f26904dbc..157f44473 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -184,7 +184,7 @@ class Post extends BaseObject } // Showing the one or the other text, depending upon if we can only hide it or really delete it. - $delete = $origin ? L10n::t('Delete') : L10n::t('Remove here'); + $delete = $origin ? L10n::t('Delete globally') : L10n::t('Remove locally'); $drop = [ 'dropping' => $dropping,