Skip to content

Commit 72cd049

Browse files
marc1706marc1706
committed
Merge branch '3.2.x' into 3.3.x
2 parents 44e9fcf + d326d80 commit 72cd049

File tree

27 files changed

+142
-53
lines changed

27 files changed

+142
-53
lines changed

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
# Titania
22

3-
Titania is the phpBB.com [Customisations Database](http://www.phpbb.com/customise/db).
3+
Titania is the phpBB.com [Customisations Database](https://www.phpbb.com/customise/db).
44

55
## Patches
66

77
Do you have an improvement? Did you fix a bug? Fork our GitHub repo, make your changes in a separate branch and send a pull request.
8-
Please read the [Git Sub-Project Guidelines](http://wiki.phpbb.com/Sub-Project_Contribution_Guidelines) before forking and fixing bugs.
98

109
## Translations
1110

‎contribution/bbcode/type.php‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,14 @@ protected function configure()
5252
$this->create_composer_packages = false;
5353
$this->extra_upload = false;
5454

55-
$this->lang = $this->user->lang('BBCODE');
56-
$this->langs = $this->user->lang('BBCODES');
57-
55+
$this->lang = array(
56+
'lang' => $this->user->lang('BBCODE'),
57+
'langs' => $this->user->lang('BBCODES'),
58+
'new' => $this->user->lang('BBCODE_CONTRIB_NEW'),
59+
'cleaned' => $this->user->lang('BBCODE_CONTRIB_CLEANED'),
60+
'hidden' => $this->user->lang('BBCODE_CONTRIB_HIDDEN'),
61+
'disabled' => $this->user->lang('BBCODE_CONTRIB_DISABLED'),
62+
);
5863
$this->validation_subject = 'BBCODE_VALIDATION';
5964
$this->validation_message_approve = 'BBCODE_VALIDATION_MESSAGE_APPROVE';
6065
$this->validation_message_deny = 'BBCODE_VALIDATION_MESSAGE_DENY';
@@ -64,12 +69,12 @@ protected function configure()
6469
'revision_bbc_html_replace' => array(
6570
'type' => 'textarea',
6671
'name' => 'REVISION_HTML_REPLACE',
67-
'explain' => 'REVISION_HTML_REPLACE_EXPLAIN'
72+
'explain' => 'REVISION_HTML_REPLACE_EXPLAIN',
6873
),
6974
'revision_bbc_bbcode_usage' => array(
7075
'type' => 'textarea',
7176
'name' => 'REVISION_BBCODE_USE',
72-
'explain' => 'REVISION_BBCODE_USE_EXPLAIN'
77+
'explain' => 'REVISION_BBCODE_USE_EXPLAIN',
7378
),
7479
'revision_bbc_help_line' => array(
7580
'type' => 'input',

‎contribution/bridge/type.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,14 @@ class type extends base
2727
public function configure()
2828
{
2929
// Language strings
30-
$this->lang = $this->user->lang('BRIDGE');
31-
$this->langs = $this->user->lang('BRIDGES');
30+
$this->lang = array(
31+
'lang' => $this->user->lang('BRIDGE'),
32+
'langs' => $this->user->lang('BRIDGES'),
33+
'new' => $this->user->lang('BRIDGE_CONTRIB_NEW'),
34+
'cleaned' => $this->user->lang('BRIDGE_CONTRIB_CLEANED'),
35+
'hidden' => $this->user->lang('BRIDGE_CONTRIB_HIDDEN'),
36+
'disabled' => $this->user->lang('BRIDGE_CONTRIB_DISABLED'),
37+
);
3238
$this->validation_subject = 'BRIDGE_VALIDATION';
3339
$this->validation_message_approve = 'BRIDGE_VALIDATION_MESSAGE_APPROVE';
3440
$this->validation_message_deny = 'BRIDGE_VALIDATION_MESSAGE_DENY';

‎contribution/converter/type.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,15 @@ public function configure()
2929
$this->forum_database = $this->ext_config->forum_converter_database;
3030
$this->forum_robot = $this->ext_config->forum_converter_robot;
3131

32-
// Language strigs
33-
$this->lang = $this->user->lang('CONVERTER');
34-
$this->langs = $this->user->lang('CONVERTERS');
32+
// Language strings
33+
$this->lang = array(
34+
'lang' => $this->user->lang('CONVERTER'),
35+
'langs' => $this->user->lang('CONVERTERS'),
36+
'new' => $this->user->lang('CONVERTER_CONTRIB_NEW'),
37+
'cleaned' => $this->user->lang('CONVERTER_CONTRIB_CLEANED'),
38+
'hidden' => $this->user->lang('CONVERTER_CONTRIB_HIDDEN'),
39+
'disabled' => $this->user->lang('CONVERTER_CONTRIB_DISABLED'),
40+
);
3541
$this->validation_subject = 'CONVERTER_VALIDATION';
3642
$this->validation_message_approve = 'CONVERTER_VALIDATION_MESSAGE_APPROVE';
3743
$this->validation_message_deny = 'CONVERTER_VALIDATION_MESSAGE_DENY';

‎contribution/extension/type.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,14 @@ protected function configure()
7272
}
7373

7474
// Language strings
75-
$this->lang = $this->user->lang('EXTENSION');
76-
$this->langs = $this->user->lang('EXTENSIONS');
75+
$this->lang = array(
76+
'lang' => $this->user->lang('EXTENSION'),
77+
'langs' => $this->user->lang('EXTENSIONS'),
78+
'new' => $this->user->lang('EXTENSION_CONTRIB_NEW'),
79+
'cleaned' => $this->user->lang('EXTENSION_CONTRIB_CLEANED'),
80+
'hidden' => $this->user->lang('EXTENSION_CONTRIB_HIDDEN'),
81+
'disabled' => $this->user->lang('EXTENSION_CONTRIB_DISABLED'),
82+
);
7783
$this->validation_subject = 'EXTENSION_VALIDATION';
7884
$this->validation_message_approve = 'EXTENSION_VALIDATION_MESSAGE_APPROVE';
7985
$this->validation_message_deny = 'EXTENSION_VALIDATION_MESSAGE_DENY';

‎contribution/mod/type.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,14 @@ protected function configure()
8787
$this->author_count = 'author_mods';
8888

8989
// Language strings
90-
$this->lang = $this->user->lang('MODIFICATION');
91-
$this->langs = $this->user->lang('MODIFICATIONS');
90+
$this->lang = array(
91+
'lang' => $this->user->lang('MODIFICATION'),
92+
'langs' => $this->user->lang('MODIFICATIONS'),
93+
'new' => $this->user->lang('MOD_CONTRIB_NEW'),
94+
'cleaned' => $this->user->lang('MOD_CONTRIB_CLEANED'),
95+
'hidden' => $this->user->lang('MOD_CONTRIB_HIDDEN'),
96+
'disabled' => $this->user->lang('MOD_CONTRIB_DISABLED'),
97+
);
9298
$this->validation_subject = 'MOD_VALIDATION';
9399
$this->validation_message_approve = 'MOD_VALIDATION_MESSAGE_APPROVE';
94100
$this->validation_message_deny = 'MOD_VALIDATION_MESSAGE_DENY';

‎contribution/official_tool/type.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,14 @@ protected function configure()
3131
$this->use_queue = false;
3232

3333
// Language strings
34-
$this->lang = $this->user->lang('OFFICIAL_TOOL');
35-
$this->langs = $this->user->lang('OFFICIAL_TOOLS');
34+
$this->lang = array(
35+
'lang' => $this->user->lang('OFFICIAL_TOOL'),
36+
'langs' => $this->user->lang('OFFICIAL_TOOLS'),
37+
'new' => $this->user->lang('OFFICIAL_TOOL_CONTRIB_NEW'),
38+
'cleaned' => $this->user->lang('OFFICIAL_TOOL_CONTRIB_CLEANED'),
39+
'hidden' => $this->user->lang('OFFICIAL_TOOL_CONTRIB_HIDDEN'),
40+
'disabled' => $this->user->lang('OFFICIAL_TOOL_CONTRIB_DISABLED'),
41+
);
3642
}
3743

3844
/**

‎contribution/style/type.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,14 @@ protected function configure()
7373
$this->author_count = 'author_styles';
7474

7575
// Language strings
76-
$this->lang = $this->user->lang('STYLE');
77-
$this->langs = $this->user->lang('STYLES');
76+
$this->lang = array(
77+
'lang' => $this->user->lang('STYLE'),
78+
'langs' => $this->user->lang('STYLES'),
79+
'new' => $this->user->lang('STYLE_CONTRIB_NEW'),
80+
'cleaned' => $this->user->lang('STYLE_CONTRIB_CLEANED'),
81+
'hidden' => $this->user->lang('STYLE_CONTRIB_HIDDEN'),
82+
'disabled' => $this->user->lang('STYLE_CONTRIB_DISABLED'),
83+
);
7884
$this->validation_subject = 'STYLE_VALIDATION';
7985
$this->validation_message_approve = 'STYLE_VALIDATION_MESSAGE_APPROVE';
8086
$this->validation_message_deny = 'STYLE_VALIDATION_MESSAGE_DENY';

‎contribution/translation/type.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,14 @@ public function configure()
8989
);
9090

9191
// Language strings
92-
$this->lang = $this->user->lang('TRANSLATION');
93-
$this->langs = $this->user->lang('TRANSLATIONS');
92+
$this->lang = array(
93+
'lang' => $this->user->lang('TRANSLATION'),
94+
'langs' => $this->user->lang('TRANSLATIONS'),
95+
'new' => $this->user->lang('TRANSLATION_CONTRIB_NEW'),
96+
'cleaned' => $this->user->lang('TRANSLATION_CONTRIB_CLEANED'),
97+
'hidden' => $this->user->lang('TRANSLATION_CONTRIB_HIDDEN'),
98+
'disabled' => $this->user->lang('TRANSLATION_CONTRIB_DISABLED'),
99+
);
94100
$this->root_not_found_key = 'COULD_NOT_FIND_TRANSLATION_ROOT';
95101
$this->validation_subject = 'TRANSLATION_VALIDATION';
96102
$this->validation_message_approve = 'TRANSLATION_VALIDATION_MESSAGE_APPROVE';

‎contribution/type/base.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,15 @@ class base implements type_interface
5353
public $name = '';
5454

5555
/**
56-
* The language string identifying the type.
56+
* The language array identifying all language keys based on the type.
5757
*
58-
* $langs is the plural forms of this.
58+
* Ex:
59+
* lang['lang'] is the singular form.
60+
* lang['langs'] is the plural form.
5961
*
6062
* @var string
6163
*/
62-
public $lang = '';
63-
public $langs = '';
64+
public $lang = array();
6465

6566
/**
6667
* Additional steps to run when uploading a revision.

0 commit comments

Comments
 (0)