WordPress.org

Make WordPress Core


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.6/wp-includes/l10n.php

    r8065 r8557  
    243243    global $l10n;
    244244
    245     if (isset($l10n[$domain]))
    246         return;
    247 
    248245    if ( is_readable($mofile))
    249246        $input = new CachedFileReader($mofile);
     
    251248        return;
    252249
    253     $l10n[$domain] = new gettext_reader($input);
     250    $gettext = new gettext_reader($input);
     251
     252    if (isset($l10n[$domain])) {
     253        $l10n[$domain]->load_tables();
     254        $gettext->load_tables();
     255        $l10n[$domain]->cache_translations = array_merge($gettext->cache_translations, $l10n[$domain]->cache_translations);
     256    } else
     257        $l10n[$domain] = $gettext;
     258
     259    unset($input, $gettext);
    254260}
    255261
     
    257263 * load_default_textdomain() - Loads default translated strings based on locale
    258264 *
    259  * Loads the .mo file in LANGDIR constant path from WordPress root.
     265 * Loads the .mo file in WP_LANG_DIR constant path from WordPress root.
    260266 * The translated (.mo) file is named based off of the locale.
    261267 *
     
    265271    $locale = get_locale();
    266272
    267     $mofile = ABSPATH . LANGDIR . "/$locale.mo";
     273    $mofile = WP_LANG_DIR . "/$locale.mo";
    268274
    269275    load_textdomain('default', $mofile);
Note: See TracChangeset for help on using the changeset viewer.