Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow custom ts functions in extensions; defer custom ts calls until booted #15411

Merged
merged 4 commits into from
Oct 7, 2019
Merged

Allow custom ts functions in extensions; defer custom ts calls until booted #15411

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
852de6c
implemented @totten's approach to fix custom ts functions in extensions
bjendres Oct 6, 2019
2f98cf0
run strings through ts(), but skip actual translation
bjendres Oct 7, 2019
ee0d4b0
fixed style error
bjendres Oct 7, 2019
69e812b
don't prevent I18n init, @totten says it's not too costly...
bjendres Oct 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 24 additions & 16 deletions CRM/Core/I18n.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ public static function getResourceDir() {
* The params of the translation (if any).
* - domain: string|array a list of translation domains to search (in order)
* - context: string
* - skip_translation: flag (do only escape/replacement, skip the actual translation)
*
* @return string
* the translated string
Expand Down Expand Up @@ -378,24 +379,26 @@ public function crm_translate($text, $params = []) {
$raw = !empty($params['raw']);
unset($params['raw']);

if (!empty($domain)) {
// It might be prettier to cast to an array, but this is high-traffic stuff.
if (is_array($domain)) {
foreach ($domain as $d) {
$candidate = $this->crm_translate_raw($text, $d, $count, $plural, $context);
if ($candidate != $text) {
$text = $candidate;
break;
if (!isset($params['skip_translation'])) {
if (!empty($domain)) {
// It might be prettier to cast to an array, but this is high-traffic stuff.
if (is_array($domain)) {
foreach ($domain as $d) {
$candidate = $this->crm_translate_raw($text, $d, $count, $plural, $context);
if ($candidate != $text) {
$text = $candidate;
break;
}
}
}
else {
$text = $this->crm_translate_raw($text, $domain, $count, $plural, $context);
}
}
else {
$text = $this->crm_translate_raw($text, $domain, $count, $plural, $context);
$text = $this->crm_translate_raw($text, NULL, $count, $plural, $context);
}
}
else {
$text = $this->crm_translate_raw($text, NULL, $count, $plural, $context);
}

// replace the numbered %1, %2, etc. params if present
if (count($params) && !$raw) {
Expand Down Expand Up @@ -768,7 +771,7 @@ public static function getLocale() {
* the translated string
*/
function ts($text, $params = []) {
static $areSettingsAvailable = FALSE;
static $bootstrapReady = FALSE;
static $lastLocale = NULL;
static $i18n = NULL;
static $function = NULL;
Expand All @@ -778,14 +781,19 @@ function ts($text, $params = []) {
}

// When the settings become available, lookup customTranslateFunction.
if (!$areSettingsAvailable) {
$areSettingsAvailable = (bool) \Civi\Core\Container::getBootService('settings_manager');
if ($areSettingsAvailable) {
if (!$bootstrapReady) {
$bootstrapReady = (bool) \Civi\Core\Container::isContainerBooted();
if ($bootstrapReady) {
// just got ready: determine whether there is a working custom translation function
$config = CRM_Core_Config::singleton();
if (isset($config->customTranslateFunction) and function_exists($config->customTranslateFunction)) {
$function = $config->customTranslateFunction;
}
}
else {
// don't _translate_ anything until bootstrap has progressed enough
$params['skip_translation'] = 1;
}
}

$activeLocale = CRM_Core_I18n::getLocale();
Expand Down