Parent5446 has uploaded a new change for review. https://gerrit.wikimedia.org/r/112151
Change subject: Revert "Removed "Justify paragraphs" from MW user Preference." ...................................................................... Revert "Removed "Justify paragraphs" from MW user Preference." Consensus seems to have determined that users actually want this user preference. This reverts commit 2f9cfa3d26fd11e4d816502df9f3e4a68b5bc4c4. Change-Id: Id86ff80350944d0db395cf63d9fdb9043242b7a1 --- M RELEASE-NOTES-1.23 M includes/DefaultSettings.php M includes/Preferences.php M includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php M languages/messages/MessagesEn.php M maintenance/language/messages.inc 6 files changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/51/112151/1 diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index 6b70ce6..fdefa0b 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -193,7 +193,6 @@ * (bug 52811) Preference "Enable section editing via [edit] links" was removed. * (bug 52813) Preference "Show table of contents (for pages with more than 3 headings)" was removed. -* (bug 52810) Preference "Justify paragraphs" was removed. ==== Removed classes ==== * FakeMemCachedClient (deprecated in 1.18) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 63883ab..9264947 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -3989,6 +3989,7 @@ 'hideminor' => 0, 'hidepatrolled' => 0, 'imagesize' => 2, + 'justify' => 0, 'math' => 1, 'minordefault' => 0, 'newpageshidepatrolled' => 0, diff --git a/includes/Preferences.php b/includes/Preferences.php index dbf4346..04e9114 100644 --- a/includes/Preferences.php +++ b/includes/Preferences.php @@ -761,6 +761,14 @@ 'label-message' => 'tog-showhiddencats' ); + if ( $wgAllowUserCssPrefs ) { + $defaultPreferences['justify'] = array( + 'type' => 'toggle', + 'section' => 'rendering/advancedrendering', + 'label-message' => 'tog-justify', + ); + } + $defaultPreferences['numberheadings'] = array( 'type' => 'toggle', 'section' => 'rendering/advancedrendering', diff --git a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php index 8ce0ca7..424afce 100644 --- a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php +++ b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php @@ -74,6 +74,9 @@ $rules[] = 'a:lang(ar), a:lang(kk-arab), a:lang(mzn), ' . 'a:lang(ps), a:lang(ur) { text-decoration: none; }'; } + if ( $options['justify'] ) { + $rules[] = "#article, #bodyContent, #mw_content { text-align: justify; }\n"; + } if ( $options['editfont'] !== 'default' ) { // Double-check that $options['editfont'] consists of safe characters only if ( preg_match( '/^[a-zA-Z0-9_, -]+$/', $options['editfont'] ) ) { diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index ca1e2b2..21f73cc 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -658,6 +658,7 @@ # User preference toggles 'tog-underline' => 'Link underlining:', +'tog-justify' => 'Justify paragraphs', 'tog-hideminor' => 'Hide minor edits in recent changes', 'tog-hidepatrolled' => 'Hide patrolled edits in recent changes', 'tog-newpageshidepatrolled' => 'Hide patrolled pages from new page list', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 8fbb778..ea45ee6 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -28,6 +28,7 @@ ), 'toggles' => array( 'tog-underline', + 'tog-justify', 'tog-hideminor', 'tog-hidepatrolled', 'tog-newpageshidepatrolled', -- To view, visit https://gerrit.wikimedia.org/r/112151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id86ff80350944d0db395cf63d9fdb9043242b7a1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Parent5446 <tylerro...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits