Plugin Directory

Changeset 2198985


Ignore:
Timestamp:
11/22/2019 04:47:18 PM (6 years ago)
Author:
halgatewood
Message:

Locale, WPML issues

Location:
awesome-weather
Files:
73 added
2 edited

Legend:

Unmodified
Added
Removed
  • awesome-weather/trunk/awesome-weather.php

    r2195275 r2198985  
    4646function awesome_weather_setup()
    4747{
    48     global $wp_version;
    49    
    50     $locale = get_locale();
    51     if( $wp_version >= 4.7 ) $locale = get_user_locale();
    52    
    53     if( !$locale ) $locale = get_bloginfo('language');
    54     if( !$locale ) $locale = WPLANG;
    55     if( !$locale ) $locale = 'en_US';
    56    
    57     $locale = apply_filters('plugin_locale', $locale, 'awesome-weather');
    58     $locale = apply_filters('awesome_weather_plugin_locale', $locale);
    59    
    60     $mofile = WP_LANG_DIR . '/awesome-weather/awesome-weather-' . $locale . '.mo';
    61     $mo_file_plugin = plugin_dir_path( __FILE__ )  . 'languages/awesome-weather-' . $locale . '.mo';
    62 
    63     if( file_exists( $mofile ) )
    64     {
    65         load_textdomain( 'awesome-weather', $mofile );
    66         load_plugin_textdomain( 'awesome-weather', false, $mofile );
    67     }
    68     else if ( file_exists( $mo_file_plugin ) )
    69     {
    70         load_textdomain( 'awesome-weather', $mo_file_plugin );
    71         load_plugin_textdomain( 'awesome-weather', false, $mo_file_plugin );
    72     }
    73     else
    74     {
    75         load_textdomain( 'awesome-weather', dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
    76         load_plugin_textdomain( 'awesome-weather', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
    77     }
     48    $locale = apply_filters('plugin_locale', get_locale(), 'awesome-weather'); 
     49    $mofile = WP_LANG_DIR . '/awesome-weather/awesome-weather-' . $locale . '.mo';
     50 
     51    if( file_exists( $mofile ) )
     52    {
     53        load_textdomain( 'awesome-weather', $mofile );
     54    }
     55    else
     56    {
     57        load_plugin_textdomain( 'awesome-weather', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
     58    }
    7859   
    7960    if( is_admin() )
  • awesome-weather/trunk/readme.txt

    r2195895 r2198985  
    7474== Changelog ==
    7575
     76= 3.0.1 =
     77- Fix: Locale issues simplified.
     78
    7679= 3.0 =
    7780- New: Pro replaces free plugin. Thanks to everyone who supported me.
Note: See TracChangeset for help on using the changeset viewer.