From b6816c42374d3edcdcae162481bdb160b958af1a Mon Sep 17 00:00:00 2001 From: Crizzo Date: Sat, 5 Jul 2014 22:16:58 +0200 Subject: [PATCH 1/3] [ticket/12807] Changes PRUNE_FREQ to PRUNE_SHADOW_FREQ/_DAYS PHPBB3-12807 --- phpBB/adm/style/acp_forums.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index f8ea284acb..96cdc97ba7 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -284,11 +284,11 @@
-

{L_AUTO_PRUNE_FREQ_EXPLAIN}
+

{L_AUTO_PRUNE_FREQ_EXPLAIN}
{L_DAYS}
-

{L_AUTO_PRUNE_DAYS_EXPLAIN}
+

{L_AUTO_PRUNE_DAYS_EXPLAIN}
{L_DAYS}
From dbefb74abec3988629a7a3665cd1bd752ab9ede6 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Sat, 5 Jul 2014 23:57:57 +0200 Subject: [PATCH 2/3] [ticket/12807] Adds missing language variables language/en/acp/forums.php PHPBB3-12807 --- phpBB/language/en/acp/forums.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index b4f0f060e9..e8c85ae8a8 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -44,6 +44,8 @@ $lang = array_merge($lang, array( 'AUTO_PRUNE_FREQ_EXPLAIN' => 'Time in days between pruning events.', 'AUTO_PRUNE_VIEWED' => 'Auto-prune post viewed age', 'AUTO_PRUNE_VIEWED_EXPLAIN' => 'Number of days since topic was viewed after which topic is removed.', + 'AUTO_PRUNE_SHADOW_FREQ' => 'Auto-prune shadow topics frequency', + 'AUTO_PRUNE_SHADOW_DAYS' => 'Auto-prune shadow topics age', 'CONTINUE' => 'Continue', 'COPY_PERMISSIONS' => 'Copy permissions from', From addcbb1585247a6890720250385427b5107dea2e Mon Sep 17 00:00:00 2001 From: Crizzo Date: Sun, 6 Jul 2014 00:28:25 +0200 Subject: [PATCH 3/3] [ticket/12807] New variables for _EXPLAIN PHPBB3-12807 --- phpBB/adm/style/acp_forums.html | 4 ++-- phpBB/language/en/acp/forums.php | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 96cdc97ba7..4243fb8005 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -284,11 +284,11 @@
-

{L_AUTO_PRUNE_FREQ_EXPLAIN}
+

{L_AUTO_PRUNE_SHADOW_FREQ_EXPLAIN}
{L_DAYS}
-

{L_AUTO_PRUNE_DAYS_EXPLAIN}
+

{L_AUTO_PRUNE_SHADOW_DAYS_EXPLAIN}
{L_DAYS}
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index e8c85ae8a8..541d05c255 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -46,6 +46,8 @@ $lang = array_merge($lang, array( 'AUTO_PRUNE_VIEWED_EXPLAIN' => 'Number of days since topic was viewed after which topic is removed.', 'AUTO_PRUNE_SHADOW_FREQ' => 'Auto-prune shadow topics frequency', 'AUTO_PRUNE_SHADOW_DAYS' => 'Auto-prune shadow topics age', + 'AUTO_PRUNE_SHADOW_DAYS_EXPLAIN' => 'Number of days after which shadow topic is removed.', + 'AUTO_PRUNE_SHADOW_FREQ_EXPLAIN' => 'Time in days between pruning events.', 'CONTINUE' => 'Continue', 'COPY_PERMISSIONS' => 'Copy permissions from',