Skip to content
Snippets Groups Projects
Commit 7d3e5829 authored by Dries Buytaert's avatar Dries Buytaert
Browse files

- Patch #851308 by andypost: make locale cache configurable.

parent 0de52de6
No related branches found
No related tags found
No related merge requests found
...@@ -145,6 +145,7 @@ function locale_uninstall() { ...@@ -145,6 +145,7 @@ function locale_uninstall() {
variable_del('locale_js_directory'); variable_del('locale_js_directory');
variable_del('javascript_parsed'); variable_del('javascript_parsed');
variable_del('locale_field_language_fallback'); variable_del('locale_field_language_fallback');
variable_del('locale_cache_length');
foreach (language_types() as $type) { foreach (language_types() as $type) {
variable_del("language_negotiation_$type"); variable_del("language_negotiation_$type");
......
...@@ -480,7 +480,7 @@ function locale_field_language_alter(&$display_language, $context) { ...@@ -480,7 +480,7 @@ function locale_field_language_alter(&$display_language, $context) {
* @param $entity * @param $entity
* The entity to be displayed. * The entity to be displayed.
* @param $langcode * @param $langcode
* The language code $entity has to be displayed in. * The language code $entity has to be displayed in.
*/ */
function locale_field_language_fallback(&$display_language, $entity, $langcode) { function locale_field_language_fallback(&$display_language, $entity, $langcode) {
// Lazily init fallback candidates to avoid unnecessary calls. // Lazily init fallback candidates to avoid unnecessary calls.
...@@ -650,7 +650,7 @@ function locale($string = NULL, $context = NULL, $langcode = NULL) { ...@@ -650,7 +650,7 @@ function locale($string = NULL, $context = NULL, $langcode = NULL) {
// Refresh database stored cache of translations for given language. // Refresh database stored cache of translations for given language.
// We only store short strings used in current version, to improve // We only store short strings used in current version, to improve
// performance and consume less memory. // performance and consume less memory.
$result = db_query("SELECT s.source, s.context, t.translation, t.language FROM {locales_source} s LEFT JOIN {locales_target} t ON s.lid = t.lid AND t.language = :language WHERE s.textgroup = 'default' AND s.version = :version AND LENGTH(s.source) < 75", array(':language' => $langcode, ':version' => VERSION)); $result = db_query("SELECT s.source, s.context, t.translation, t.language FROM {locales_source} s LEFT JOIN {locales_target} t ON s.lid = t.lid AND t.language = :language WHERE s.textgroup = 'default' AND s.version = :version AND LENGTH(s.source) < :length", array(':language' => $langcode, ':version' => VERSION, ':length' => variable_get('locale_cache_length', 75)));
foreach ($result as $data) { foreach ($result as $data) {
$locale_t[$langcode][$data->context][$data->source] = (empty($data->translation) ? TRUE : $data->translation); $locale_t[$langcode][$data->context][$data->source] = (empty($data->translation) ? TRUE : $data->translation);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment