@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Fix reversed order of boolean config options.

Summary: See discussion in D4355, this fixes reversed bool logic.

Test Plan:
- Quickly viewed in the web interface to make sure it didn't break anything.
- Saved `ldap.auth-enabled` with correct boolean value in the db.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D4357

authored by

Ricky Elrod and committed by
epriestley
f7939b90 0f1086fd

+33 -30
+6 -3
src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
··· 18 18 ->setOptions( 19 19 array( 20 20 pht("Allow password authentication"), 21 - pht("Don't allow password authentication"))) 21 + pht("Don't allow password authentication") 22 + )) 22 23 ->setSummary(pht("Enables password-based authentication.")) 23 24 ->setDescription( 24 25 pht( ··· 60 61 ->setOptions( 61 62 array( 62 63 pht("Require email verification"), 63 - pht("Don't require email verification"))) 64 + pht("Don't require email verification") 65 + )) 64 66 ->setSummary( 65 67 pht("Require email verification before a user can log in.")) 66 68 ->setDescription( ··· 96 98 ->setOptions( 97 99 array( 98 100 pht("Allow editing"), 99 - pht("Prevent editing"))) 101 + pht("Prevent editing") 102 + )) 100 103 ->setSummary( 101 104 pht( 102 105 "Determines whether or not basic account information is ".
+1 -1
src/applications/config/option/PhabricatorCoreConfigOptions.php
··· 53 53 $this->newOption('phabricator.serious-business', 'bool', false) 54 54 ->setOptions( 55 55 array( 56 - pht('Shenanigans'), // That should be interesting to translate. :P 57 56 pht('Serious business'), 57 + pht('Shenanigans'), // That should be interesting to translate. :P 58 58 )) 59 59 ->setSummary( 60 60 pht("Should Phabricator be serious?"))
+7 -7
src/applications/config/option/PhabricatorDeveloperConfigOptions.php
··· 16 16 $this->newOption('darkconsole.enabled', 'bool', false) 17 17 ->setOptions( 18 18 array( 19 - pht("Disable DarkConsole"), 20 19 pht("Enable DarkConsole"), 20 + pht("Disable DarkConsole"), 21 21 )) 22 22 ->setSummary(pht("Enable Phabricator's debugging console.")) 23 23 ->setDescription( ··· 35 35 $this->newOption('darkconsole.always-on', 'bool', false) 36 36 ->setOptions( 37 37 array( 38 - pht("Require DarkConsole Activation"), 39 38 pht("Always Activate DarkConsole"), 39 + pht("Require DarkConsole Activation"), 40 40 )) 41 41 ->setSummary(pht("Activate DarkConsole on every page.")) 42 42 ->setDescription( ··· 50 50 $this->newOption('debug.stop-on-redirect', 'bool', false) 51 51 ->setOptions( 52 52 array( 53 - pht("Use Normal HTTP Redirects"), 54 53 pht("Stop Before HTTP Redirect"), 54 + pht("Use Normal HTTP Redirects"), 55 55 )) 56 56 ->setSummary( 57 57 pht( ··· 89 89 $this->newOption('phabricator.show-stack-traces', 'bool', false) 90 90 ->setOptions( 91 91 array( 92 - pht('Hide stack traces'), 93 92 pht('Show stack traces'), 93 + pht('Hide stack traces'), 94 94 )) 95 95 ->setSummary(pht("Show stack traces when unhandled exceptions occur.")) 96 96 ->setDescription( ··· 101 101 $this->newOption('phabricator.show-error-callout', 'bool', false) 102 102 ->setOptions( 103 103 array( 104 - pht('Hide error callout'), 105 104 pht('Show error callout'), 105 + pht('Hide error callout'), 106 106 )) 107 107 ->setSummary(pht("Show error callout.")) 108 108 ->setDescription( ··· 114 114 $this->newOption('celerity.force-disk-reads', 'bool', false) 115 115 ->setOptions( 116 116 array( 117 + pht('Force disk reads'), 117 118 pht("Don't force disk reads"), 118 - pht('Force disk reads'), 119 119 )) 120 120 ->setSummary(pht("Force Celerity to read from disk on every request.")) 121 121 ->setDescription( ··· 131 131 $this->newOption('celerity.minify', 'bool', false) 132 132 ->setOptions( 133 133 array( 134 - pht("Don't minify static resources."), 135 134 pht('Minify static resources.'), 135 + pht("Don't minify static resources."), 136 136 )) 137 137 ->setSummary(pht("Minify static Celerity resources.")) 138 138 ->setDescription(
+3 -3
src/applications/config/option/PhabricatorDisqusConfigOptions.php
··· 16 16 $this->newOption('disqus.auth-enabled', 'bool', false) 17 17 ->setOptions( 18 18 array( 19 - pht("Disable Disqus Authentication"), 20 19 pht("Enable Disqus Authentication"), 20 + pht("Disable Disqus Authentication"), 21 21 )) 22 22 ->setDescription( 23 23 pht( ··· 25 25 $this->newOption('disqus.registration-enabled', 'bool', true) 26 26 ->setOptions( 27 27 array( 28 - pht("Disable Disqus Registration"), 29 28 pht("Enable Disqus Registration"), 29 + pht("Disable Disqus Registration"), 30 30 )) 31 31 ->setDescription( 32 32 pht( ··· 35 35 $this->newOption('disqus.auth-permanent', 'bool', false) 36 36 ->setOptions( 37 37 array( 38 - pht("Allow Disqus Account Unlinking"), 39 38 pht("Permanently Bind Disqus Accounts"), 39 + pht("Allow Disqus Account Unlinking"), 40 40 )) 41 41 ->setDescription( 42 42 pht(
+4 -4
src/applications/config/option/PhabricatorFacebookConfigOptions.php
··· 16 16 $this->newOption('facebook.auth-enabled', 'bool', false) 17 17 ->setOptions( 18 18 array( 19 - pht("Disable Facebook Authentication"), 20 19 pht("Enable Facebook Authentication"), 20 + pht("Disable Facebook Authentication"), 21 21 )) 22 22 ->setDescription( 23 23 pht( ··· 25 25 $this->newOption('facebook.registration-enabled', 'bool', true) 26 26 ->setOptions( 27 27 array( 28 - pht("Disable Facebook Registration"), 29 28 pht("Enable Facebook Registration"), 29 + pht("Disable Facebook Registration"), 30 30 )) 31 31 ->setDescription( 32 32 pht( ··· 35 35 $this->newOption('facebook.auth-permanent', 'bool', false) 36 36 ->setOptions( 37 37 array( 38 - pht("Allow Facebook Account Unlinking"), 39 38 pht("Permanently Bind Facebook Accounts"), 39 + pht("Allow Facebook Account Unlinking"), 40 40 )) 41 41 ->setDescription( 42 42 pht( ··· 53 53 $this->newOption('facebook.require-https-auth', 'bool', false) 54 54 ->setOptions( 55 55 array( 56 - pht("Do Not Require HTTPS"), 57 56 pht("Require HTTPS"), 57 + pht("Do Not Require HTTPS"), 58 58 )) 59 59 ->setSummary( 60 60 pht(
+3 -3
src/applications/config/option/PhabricatorGitHubConfigOptions.php
··· 16 16 $this->newOption('github.auth-enabled', 'bool', false) 17 17 ->setOptions( 18 18 array( 19 - pht("Disable GitHub Authentication"), 20 19 pht("Enable GitHub Authentication"), 20 + pht("Disable GitHub Authentication"), 21 21 )) 22 22 ->setDescription( 23 23 pht( ··· 25 25 $this->newOption('github.registration-enabled', 'bool', true) 26 26 ->setOptions( 27 27 array( 28 - pht("Disable GitHub Registration"), 29 28 pht("Enable GitHub Registration"), 29 + pht("Disable GitHub Registration"), 30 30 )) 31 31 ->setDescription( 32 32 pht( ··· 35 35 $this->newOption('github.auth-permanent', 'bool', false) 36 36 ->setOptions( 37 37 array( 38 - pht("Allow GitHub Account Unlinking"), 39 38 pht("Permanently Bind GitHub Accounts"), 39 + pht("Allow GitHub Account Unlinking"), 40 40 )) 41 41 ->setDescription( 42 42 pht(
+3 -3
src/applications/config/option/PhabricatorGoogleConfigOptions.php
··· 16 16 $this->newOption('google.auth-enabled', 'bool', false) 17 17 ->setOptions( 18 18 array( 19 - pht("Disable Google Authentication"), 20 19 pht("Enable Google Authentication"), 20 + pht("Disable Google Authentication"), 21 21 )) 22 22 ->setDescription( 23 23 pht( ··· 25 25 $this->newOption('google.registration-enabled', 'bool', true) 26 26 ->setOptions( 27 27 array( 28 - pht("Disable Google Registration"), 29 28 pht("Enable Google Registration"), 29 + pht("Disable Google Registration"), 30 30 )) 31 31 ->setDescription( 32 32 pht( ··· 35 35 $this->newOption('google.auth-permanent', 'bool', false) 36 36 ->setOptions( 37 37 array( 38 - pht("Allow Google Account Unlinking"), 39 38 pht("Permanently Bind Google Accounts"), 39 + pht("Allow Google Account Unlinking"), 40 40 )) 41 41 ->setDescription( 42 42 pht(
+3 -3
src/applications/config/option/PhabricatorLDAPConfigOptions.php
··· 16 16 $this->newOption('ldap.auth-enabled', 'bool', false) 17 17 ->setOptions( 18 18 array( 19 - pht("Disable LDAP Authentication"), 20 19 pht("Enable LDAP Authentication"), 20 + pht("Disable LDAP Authentication"), 21 21 )) 22 22 ->setDescription( 23 23 pht('Enable LDAP for authentication and registration.')), ··· 41 41 $this->newOption('ldap.search-first', 'bool', false) 42 42 ->setOptions( 43 43 array( 44 - pht("Disabled"), 45 44 pht("Enabled"), 45 + pht("Disabled"), 46 46 )), 47 47 $this->newOption('ldap.username-attribute', 'string', null), 48 48 $this->newOption('ldap.real_name_attributes', 'list<string>', array()) ··· 56 56 $this->newOption('ldap.referrals', 'bool', true) 57 57 ->setOptions( 58 58 array( 59 - pht("Do Not Follow Referrals"), 60 59 pht("Follow Referrals"), 60 + pht("Do Not Follow Referrals"), 61 61 )) 62 62 ->setDescription( 63 63 pht("You may need to disable this if you use Windows 2003 ".
+1 -1
src/applications/config/option/PhabricatorNotificationConfigOptions.php
··· 16 16 $this->newOption('notification.enabled', 'bool', false) 17 17 ->setOptions( 18 18 array( 19 - pht("Disable Real-Time Notifications"), 20 19 pht("Enable Real-Time Notifications"), 20 + pht("Disable Real-Time Notifications"), 21 21 )) 22 22 ->setSummary(pht('Enable real-time notifications.')) 23 23 ->setDescription(
+1 -1
src/applications/config/option/PhabricatorRecaptchaConfigOptions.php
··· 17 17 $this->newOption('recaptcha.enabled', 'bool', false) 18 18 ->setOptions( 19 19 array( 20 - pht("Disable Recaptcha"), 21 20 pht("Enable Recaptcha"), 21 + pht("Disable Recaptcha"), 22 22 )) 23 23 ->setSummary(pht('Enable captchas with Recaptcha.')) 24 24 ->setDescription(
+1 -1
src/applications/config/option/PhabricatorSecurityConfigOptions.php
··· 75 75 "\$_SERVER['HTTPS'] to the correct value.")) 76 76 ->setOptions( 77 77 array( 78 - pht('Allow HTTP'), 79 78 pht('Force HTTPS'), 79 + pht('Allow HTTP'), 80 80 )), 81 81 $this->newOption( 82 82 'phabricator.csrf-key',