WordPress.org

Make WordPress Core


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/l10n.php

    r8557 r8065  
    243243    global $l10n;
    244244
     245    if (isset($l10n[$domain]))
     246        return;
     247
    245248    if ( is_readable($mofile))
    246249        $input = new CachedFileReader($mofile);
     
    248251        return;
    249252
    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);
     253    $l10n[$domain] = new gettext_reader($input);
    260254}
    261255
     
    263257 * load_default_textdomain() - Loads default translated strings based on locale
    264258 *
    265  * Loads the .mo file in WP_LANG_DIR constant path from WordPress root.
     259 * Loads the .mo file in LANGDIR constant path from WordPress root.
    266260 * The translated (.mo) file is named based off of the locale.
    267261 *
     
    271265    $locale = get_locale();
    272266
    273     $mofile = WP_LANG_DIR . "/$locale.mo";
     267    $mofile = ABSPATH . LANGDIR . "/$locale.mo";
    274268
    275269    load_textdomain('default', $mofile);
Note: See TracChangeset for help on using the changeset viewer.