sforkowany z mirror/friendica
				
			Move L10n::getCurrentLang() calls to DI::l10n()->getCurrentLang() calls
							rodzic
							
								
									cb4ad529f4
								
							
						
					
					
						commit
						d83f6335eb
					
				|  | @ -1165,7 +1165,7 @@ function settings_content(App $a) | |||
| 	} | ||||
| 
 | ||||
| 	/* Installed langs */ | ||||
| 	$lang_choices = L10n::getAvailableLanguages(); | ||||
| 	$lang_choices = DI::l10n()->getAvailableLanguages(); | ||||
| 
 | ||||
| 	/// @TODO Fix indending (or so)
 | ||||
| 	$o .= Renderer::replaceMacros($stpl, [ | ||||
|  |  | |||
|  | @ -414,7 +414,7 @@ class Site extends BaseAdminModule | |||
| 		parent::content($parameters); | ||||
| 
 | ||||
| 		/* Installed langs */ | ||||
| 		$lang_choices = L10n::getAvailableLanguages(); | ||||
| 		$lang_choices = DI::l10n()->getAvailableLanguages(); | ||||
| 
 | ||||
| 		if (strlen(Config::get('system', 'directory_submit_url')) && | ||||
| 			!strlen(Config::get('system', 'directory'))) { | ||||
|  |  | |||
|  | @ -255,7 +255,7 @@ class Install extends BaseModule | |||
| 
 | ||||
| 			case self::SITE_SETTINGS: | ||||
| 				/* Installed langs */ | ||||
| 				$lang_choices = L10n::getAvailableLanguages(); | ||||
| 				$lang_choices = DI::l10n()->getAvailableLanguages(); | ||||
| 
 | ||||
| 				$tpl    = Renderer::getMarkupTemplate('install_settings.tpl'); | ||||
| 				$output .= Renderer::replaceMacros($tpl, [ | ||||
|  |  | |||
|  | @ -219,7 +219,7 @@ class Temporal | |||
| 		// First day of the week (0 = Sunday)
 | ||||
| 		$firstDay = DI::pConfig()->get(local_user(), 'system', 'first_day_of_week', 0); | ||||
| 
 | ||||
| 		$lang = substr(L10n::getCurrentLang(), 0, 2); | ||||
| 		$lang = substr(DI::l10n()->getCurrentLang(), 0, 2); | ||||
| 
 | ||||
| 		// Check if the detected language is supported by the picker
 | ||||
| 		if (!in_array($lang, | ||||
|  |  | |||
|  | @ -300,7 +300,7 @@ function update_1298() | |||
| 	$keys = ['gender', 'marital', 'sexual']; | ||||
| 	foreach ($keys as $translateKey) { | ||||
| 		$allData = DBA::select('profile', ['id', $translateKey]); | ||||
| 		$allLangs = L10n::getAvailableLanguages(); | ||||
| 		$allLangs = DI::l10n()->getAvailableLanguages(); | ||||
| 		$success = 0; | ||||
| 		$fail = 0; | ||||
| 		foreach ($allData as $key => $data) { | ||||
|  |  | |||
		Ładowanie…
	
		Reference in New Issue
	
	 nupplaPhil
						nupplaPhil