Mwalker has submitted this change and it was merged.
Change subject: Requested additional options
......................................................................
Requested additional options
TOC checkbox and number-of-columns selector.
Change-Id: I2d78c26e07bb2c122d0ea64d640494cf605fc956
---
M Collection.i18n.php
M Collection.php
2 files changed, 43 insertions(+), 4 deletions(-)
Approvals:
Siebrand: Looks good to me, but someone else must approve
Mwalker: Looks good to me, approved
diff --git a/Collection.i18n.php b/Collection.i18n.php
index 610975e..5f68ba0 100644
--- a/Collection.i18n.php
+++ b/Collection.i18n.php
@@ -215,6 +215,10 @@
'coll-setting-papersize' => 'Paper size:',
'coll-setting-papersize-a4' => 'A4',
'coll-setting-papersize-letter' => 'Letter',
+ 'coll-setting-showtoc' => 'Include a table of contents',
+ 'coll-setting-columns' => 'Columns:',
+ 'coll-setting-columns-1' => '1',
+ 'coll-setting-columns-2' => '2',
);
/** Message documentation (Message documentation)
@@ -535,18 +539,39 @@
{{Identical|Empty}}',
'coll-user_book_prefix' => '{{notranslate}}',
'coll-community_book_prefix' => '{{notranslate}}',
- 'coll-setting-papersize' => 'See also:
+
+ 'coll-setting-papersize' => 'Label for the "paper size" option.
+
+See also:
* {{msg-mw|Coll-setting-papersize-a4}}
* {{msg-mw|Coll-setting-papersize-letter}}
{{Identical|Paper size}}',
- 'coll-setting-papersize-a4' => '{{optional}}
+ 'coll-setting-papersize-a4' => '{{optional}} Name for the A4 paper size
See also:
* {{msg-mw|Coll-setting-papersize}}
* {{msg-mw|Coll-setting-papersize-letter}}',
- 'coll-setting-papersize-letter' => 'See also:
+ 'coll-setting-papersize-letter' => 'Name for the US Letter paper size
+
+See also:
* {{msg-mw|Coll-setting-papersize}}
* {{msg-mw|Coll-setting-papersize-a4}}
{{Identical|Letter}}',
+ 'coll-setting-showtoc' => 'Label for the "include a table of
contents" checkbox',
+ 'coll-setting-columns' => 'Label for the "number of columns"
option
+
+See also:
+* {{msg-mw|Coll-setting-columns-1}}
+* {{msg-mw|Coll-setting-columns-2}}',
+ 'coll-setting-columns-1' => '{{optional}}
+
+See also:
+* {{msg-mw|Coll-setting-columns}}
+* {{msg-mw|Coll-setting-columns-2}}',
+ 'coll-setting-columns-2' => '{{optional}}
+
+See also:
+* {{msg-mw|Coll-setting-columns}}
+* {{msg-mw|Coll-setting-columns-1}}',
);
/** Abkhazian (Аҧсшәа)
diff --git a/Collection.php b/Collection.php
index cd0343d..8874255 100644
--- a/Collection.php
+++ b/Collection.php
@@ -117,7 +117,21 @@
'default' => 'A4',
'options' => array(
'coll-setting-papersize-a4' => 'A4',
- 'coll-setting-papersize-letter' => 'Letter'
+ 'coll-setting-papersize-letter' => 'Letter',
+ ),
+ ),
+ 'showtoc' => array(
+ 'type' => 'check',
+ 'label-message' => 'coll-setting-showtoc',
+ 'default' => true,
+ ),
+ 'columns' => array(
+ 'type' => 'select',
+ 'label-message' => 'coll-setting-columns',
+ 'default' => 1,
+ 'options' => array(
+ 'coll-setting-columns-1' => '1',
+ 'coll-setting-columns-2' => '2',
),
),
);
--
To view, visit https://gerrit.wikimedia.org/r/107620
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2d78c26e07bb2c122d0ea64d640494cf605fc956
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
