aboutsummaryrefslogtreecommitdiff
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2020-01-22 21:21:01 +0100
committerMarc Alexander <admin@m-a-styles.de>2020-01-22 21:21:01 +0100
commiteff3b08d4997b0d89e7ab88ae117e1340fc81a61 (patch)
tree5688e30a2deaa180385edeb8806d9eb558eaa16a /phpBB
parentMerge pull request #5814 from 3D-I/ticket/15079 (diff)
parent[ticket/16332] Amend formatting tests to expect translated code string (diff)
downloadphpbb-eff3b08d4997b0d89e7ab88ae117e1340fc81a61.tar.gz
phpbb-eff3b08d4997b0d89e7ab88ae117e1340fc81a61.tar.bz2
phpbb-eff3b08d4997b0d89e7ab88ae117e1340fc81a61.zip
Merge pull request #5833 from mrgoldy/ticket/16332
[ticket/16332] Code and Quote language strings globally available
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/language/en/common.php4
-rw-r--r--phpBB/language/en/viewtopic.php3
2 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 3ba63746c8..6a27e6b89d 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -167,6 +167,7 @@ $lang = array_merge($lang, array(
),
'COLLAPSE_VIEW' => 'Collapse view',
'CLOSE_WINDOW' => 'Close window',
+ 'CODE' => 'Code',
'COLOUR_SWATCH' => 'Colour swatch',
'COLON' => ':',
'COMMA_SEPARATOR' => ', ', // Comma used to join lists into a single string, use localised comma if appropriate, eg: Ideographic or Arabic
@@ -605,6 +606,9 @@ $lang = array_merge($lang, array(
'POST_UNAPPROVED_ACTION' => 'Post awaiting approval:',
'POST_UNAPPROVED' => 'This post has not been approved.',
'POWERED_BY' => 'Powered by %s',
+
+ 'QUOTE' => 'Quote',
+
'PREVIEW' => 'Preview',
'PREVIOUS' => 'Previous', // Used in pagination
'PREVIOUS_STEP' => 'Previous',
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 5d127acb3d..e5c9be0517 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -49,8 +49,6 @@ $lang = array_merge($lang, array(
'BUMPED_BY' => 'Last bumped by %1$s on %2$s.',
'BUMP_TOPIC' => 'Bump topic',
- 'CODE' => 'Code',
-
'DELETE_TOPIC' => 'Delete topic',
'DELETED_INFORMATION' => 'Deleted by %1$s on %2$s',
'DISAPPROVE' => 'Disapprove',
@@ -98,7 +96,6 @@ $lang = array_merge($lang, array(
'QUICK_MOD' => 'Quick-mod tools',
'QUICKREPLY' => 'Quick Reply',
- 'QUOTE' => 'Quote',
'REPLY_TO_TOPIC' => 'Reply to topic',
'RESTORE' => 'Restore',