X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=blobdiff_plain;f=includes%2FGlobalFunctions.php;h=d53e98dbe1747bcd7f267ab396417e910ae37f97;hb=009764c0aef9827ee470120ecb294cc0cd56de86;hp=484dfe8d4d624050a1fa78dd503b9ed3d0e67667;hpb=53ecf20db8bfc2109553e80bf932dac7321d63ec;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 484dfe8d4d..d53e98dbe1 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2259,6 +2259,7 @@ function wfEscapeShellArg( /*...*/ ) {
  * @deprecated since 1.30 use MediaWiki\Shell::isDisabled()
  */
 function wfShellExecDisabled() {
+	wfDeprecated( __FUNCTION__, '1.30' );
 	return Shell::isDisabled() ? 'disabled' : false;
 }
 
@@ -2350,6 +2351,7 @@ function wfShellExecWithStderr( $cmd, &$retval = null, $environ = [], $limits =
  * @see $wgShellLocale
  */
 function wfInitShellLocale() {
+	wfDeprecated( __FUNCTION__, '1.30' );
 }
 
 /**
@@ -3166,29 +3168,13 @@ function wfShorthandToInteger( $string = '', $default = -1 ) {
  * See unit test for examples.
  * See mediawiki.language.bcp47 for the JavaScript implementation.
  *
+ * @deprecated since 1.31, use LanguageCode::bcp47() directly.
+ *
  * @param string $code The language code.
  * @return string The language code which complying with BCP 47 standards.
  */
 function wfBCP47( $code ) {
-	$codeSegment = explode( '-', $code );
-	$codeBCP = [];
-	foreach ( $codeSegment as $segNo => $seg ) {
-		// when previous segment is x, it is a private segment and should be lc
-		if ( $segNo > 0 && strtolower( $codeSegment[( $segNo - 1 )] ) == 'x' ) {
-			$codeBCP[$segNo] = strtolower( $seg );
-		// ISO 3166 country code
-		} elseif ( ( strlen( $seg ) == 2 ) && ( $segNo > 0 ) ) {
-			$codeBCP[$segNo] = strtoupper( $seg );
-		// ISO 15924 script code
-		} elseif ( ( strlen( $seg ) == 4 ) && ( $segNo > 0 ) ) {
-			$codeBCP[$segNo] = ucfirst( strtolower( $seg ) );
-		// Use lowercase for other cases
-		} else {
-			$codeBCP[$segNo] = strtolower( $seg );
-		}
-	}
-	$langCode = implode( '-', $codeBCP );
-	return $langCode;
+	return LanguageCode::bcp47( $code );
 }
 
 /**