| @@ -1,8 +1,5 @@ | ||
| 1 | 1 | <?php |
| 2 | -/** | |
| 3 | - * @package Polylang | |
| 4 | - */ | |
| 5 | 2 | |
| 6 | 3 | /** |
| 7 | 4 | * Base class for both admin |
| 8 | 5 | * |
| @@ -22,9 +19,9 @@ | ||
| 22 | 19 | public function __construct( &$links_model ) { |
| 23 | 20 | parent::__construct( $links_model ); |
| 24 | 21 | |
| 25 | 22 | // Plugin i18n, only needed for backend |
| 26 | - load_plugin_textdomain( 'polylang' ); | |
| 23 | + load_plugin_textdomain( 'polylang', false, basename( POLYLANG_DIR ).'/languages' ); | |
| 27 | 24 | |
| 28 | 25 | // Adds the link to the languages panel in the WordPress admin menu |
| 29 | 26 | add_action( 'admin_menu', array( $this, 'add_menus' ) ); |
| 30 | 27 | |
| @@ -29,11 +26,14 @@ | ||
| 29 | 26 | add_action( 'admin_menu', array( $this, 'add_menus' ) ); |
| 30 | 27 | |
| 31 | 28 | // Setup js scripts and css styles |
| 32 | 29 | add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) ); |
| 33 | - add_action( 'admin_print_footer_scripts', array( $this, 'admin_print_footer_scripts' ), 0 ); // High priority in case an ajax request is sent by an immediately invoked function | |
| 30 | + add_action( 'admin_print_footer_scripts', array( $this, 'admin_print_footer_scripts' ) ); | |
| 34 | 31 | |
| 35 | - add_action( 'customize_controls_enqueue_scripts', array( $this, 'customize_controls_enqueue_scripts' ) ); | |
| 32 | + // Lingotek | |
| 33 | + if ( ! defined( 'PLL_LINGOTEK_AD' ) || PLL_LINGOTEK_AD ) { | |
| 34 | + require_once( POLYLANG_DIR . '/lingotek/lingotek.php' ); | |
| 35 | + } | |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | 39 | * Setups filters and action needed on all admin pages and on plugins page |
| @@ -39,14 +39,12 @@ | ||
| 39 | 39 | * Setups filters and action needed on all admin pages and on plugins page |
| 40 | 40 | * Loads the settings pages or the filters base on the request |
| 41 | 41 | * |
| 42 | 42 | * @since 1.2 |
| 43 | + * | |
| 44 | + * @param object $links_model | |
| 43 | 45 | */ |
| 44 | 46 | public function init() { |
| 45 | - parent::init(); | |
| 46 | - | |
| 47 | - $this->notices = new PLL_Admin_Notices( $this ); | |
| 48 | - | |
| 49 | 47 | if ( ! $this->model->get_languages_list() ) { |
| 50 | 48 | return; |
| 51 | 49 | } |
| 52 | 50 | |
| @@ -55,9 +53,9 @@ | ||
| 55 | 53 | $this->filters_links = new PLL_Filters_Links( $this ); // FIXME needed here ? |
| 56 | 54 | |
| 57 | 55 | // Filter admin language for users |
| 58 | 56 | // We must not call user info before WordPress defines user roles in wp-settings.php |
| 59 | - add_action( 'setup_theme', array( $this, 'init_user' ) ); | |
| 57 | + add_filter( 'setup_theme', array( $this, 'init_user' ) ); | |
| 60 | 58 | add_filter( 'request', array( $this, 'request' ) ); |
| 61 | 59 | |
| 62 | 60 | // Adds the languages in admin bar |
| 63 | 61 | add_action( 'admin_bar_menu', array( $this, 'admin_bar_menu' ), 100 ); // 100 determines the position |
| @@ -68,41 +66,9 @@ | ||
| 68 | 66 | * |
| 69 | 67 | * @since 0.1 |
| 70 | 68 | */ |
| 71 | 69 | public function add_menus() { |
| 72 | - global $admin_page_hooks; | |
| 73 | - | |
| 74 | - // Prepare the list of tabs | |
| 75 | - $tabs = array( 'lang' => __( 'Languages', 'polylang' ) ); | |
| 76 | - | |
| 77 | - // Only if at least one language has been created | |
| 78 | - if ( $this->model->get_languages_list() ) { | |
| 79 | - $tabs['strings'] = __( 'Strings translations', 'polylang' ); | |
| 80 | - } | |
| 81 | - | |
| 82 | - $tabs['settings'] = __( 'Settings', 'polylang' ); | |
| 83 | - | |
| 84 | - /** | |
| 85 | - * Filter the list of tabs in Polylang settings | |
| 86 | - * | |
| 87 | - * @since 1.5.1 | |
| 88 | - * | |
| 89 | - * @param array $tabs list of tab names | |
| 90 | - */ | |
| 91 | - $tabs = apply_filters( 'pll_settings_tabs', $tabs ); | |
| 92 | - | |
| 93 | - $parent = ''; | |
| 94 | - | |
| 95 | - foreach ( $tabs as $tab => $title ) { | |
| 96 | - $page = 'lang' === $tab ? 'mlang' : "mlang_$tab"; | |
| 97 | - if ( empty( $parent ) ) { | |
| 98 | - $parent = $page; | |
| 99 | - add_menu_page( $title, __( 'Languages', 'polylang' ), 'manage_options', $page, null, 'dashicons-translation' ); | |
| 100 | - $admin_page_hooks[ $page ] = 'languages'; // Hack to avoid the localization of the hook name. See: https://core.trac.wordpress.org/ticket/18857 | |
| 101 | - } | |
| 102 | - | |
| 103 | - add_submenu_page( $parent, $title, $title, 'manage_options', $page, array( $this, 'languages_page' ) ); | |
| 104 | - } | |
| 70 | + add_submenu_page( 'options-general.php', $title = __( 'Languages', 'polylang' ), $title, 'manage_options', 'mlang', '__return_null' ); | |
| 105 | 71 | } |
| 106 | 72 | |
| 107 | 73 | /** |
| 108 | 74 | * Setup js scripts & css styles ( only on the relevant pages ) |
| @@ -116,80 +82,31 @@ | ||
| 116 | 82 | } |
| 117 | 83 | |
| 118 | 84 | $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; |
| 119 | 85 | |
| 120 | - /* | |
| 121 | - * For each script: | |
| 122 | - * 0 => the pages on which to load the script | |
| 123 | - * 1 => the scripts it needs to work | |
| 124 | - * 2 => 1 if loaded even if languages have not been defined yet, 0 otherwise | |
| 125 | - * 3 => 1 if loaded in footer | |
| 126 | - */ | |
| 86 | + // For each script: | |
| 87 | + // 0 => the pages on which to load the script | |
| 88 | + // 1 => the scripts it needs to work | |
| 89 | + // 2 => 1 if loaded even if languages have not been defined yet, 0 otherwise | |
| 90 | + // 3 => 1 if loaded in footer | |
| 91 | + // FIXME: check if I can load more scripts in footer | |
| 127 | 92 | $scripts = array( |
| 128 | - 'user' => array( array( 'profile', 'user-edit' ), array( 'jquery' ), 0, 0 ), | |
| 129 | - 'widgets' => array( array( 'widgets' ), array( 'jquery' ), 0, 0 ), | |
| 93 | + 'post' => array( array( 'post', 'media', 'async-upload', 'edit' ), array( 'jquery', 'wp-ajax-response', 'post', 'jquery-ui-autocomplete' ), 0 , 1 ), | |
| 94 | + 'media' => array( array( 'upload' ), array( 'jquery' ), 0 , 1 ), | |
| 95 | + 'term' => array( array( 'edit-tags', 'term' ), array( 'jquery', 'wp-ajax-response', 'jquery-ui-autocomplete' ), 0, 1 ), | |
| 96 | + 'user' => array( array( 'profile', 'user-edit' ), array( 'jquery' ), 0 , 0 ), | |
| 130 | 97 | ); |
| 131 | 98 | |
| 132 | - if ( ! empty( $screen->post_type ) && $this->model->is_translated_post_type( $screen->post_type ) ) { | |
| 133 | - $scripts['post'] = array( array( 'edit', 'upload' ), array( 'jquery', 'wp-ajax-response' ), 0, 1 ); | |
| 134 | - | |
| 135 | - // Classic editor. | |
| 136 | - if ( ! method_exists( $screen, 'is_block_editor' ) || ! $screen->is_block_editor() ) { | |
| 137 | - $scripts['classic-editor'] = array( array( 'post', 'media', 'async-upload' ), array( 'jquery', 'wp-ajax-response', 'post' ), 0, 1 ); | |
| 138 | - } | |
| 139 | - | |
| 140 | - // Block editor with legacy metabox in WP 5.0+. | |
| 141 | - if ( method_exists( $screen, 'is_block_editor' ) && $screen->is_block_editor() && ! pll_use_block_editor_plugin() ) { | |
| 142 | - $scripts['block-editor'] = array( array( 'post' ), array( 'jquery', 'wp-ajax-response', 'wp-api-fetch' ), 0, 1 ); | |
| 143 | - } | |
| 144 | - } | |
| 145 | - | |
| 146 | - if ( ! empty( $screen->taxonomy ) && $this->model->is_translated_taxonomy( $screen->taxonomy ) ) { | |
| 147 | - $scripts['term'] = array( array( 'edit-tags', 'term' ), array( 'jquery', 'wp-ajax-response', 'jquery-ui-autocomplete' ), 0, 1 ); | |
| 148 | - } | |
| 149 | - | |
| 150 | 99 | foreach ( $scripts as $script => $v ) { |
| 151 | 100 | if ( in_array( $screen->base, $v[0] ) && ( $v[2] || $this->model->get_languages_list() ) ) { |
| 152 | - wp_enqueue_script( 'pll_' . $script, plugins_url( '/js/' . $script . $suffix . '.js', POLYLANG_FILE ), $v[1], POLYLANG_VERSION, $v[3] ); | |
| 101 | + wp_enqueue_script( 'pll_' . $script, POLYLANG_URL . '/js/' . $script . $suffix . '.js', $v[1], POLYLANG_VERSION, $v[3] ); | |
| 153 | 102 | } |
| 154 | 103 | } |
| 155 | 104 | |
| 156 | - wp_enqueue_style( 'polylang_admin', plugins_url( '/css/admin' . $suffix . '.css', POLYLANG_FILE ), array(), POLYLANG_VERSION ); | |
| 157 | - | |
| 158 | - $this->localize_scripts(); | |
| 105 | + wp_enqueue_style( 'polylang_admin', POLYLANG_URL . '/css/admin' . $suffix . '.css', array(), POLYLANG_VERSION ); | |
| 159 | 106 | } |
| 160 | 107 | |
| 161 | 108 | /** |
| 162 | - * Enqueue scripts to the WP Customizer. | |
| 163 | - * | |
| 164 | - * @since 2.4.0 | |
| 165 | - */ | |
| 166 | - public function customize_controls_enqueue_scripts() { | |
| 167 | - if ( $this->model->get_languages_list() ) { | |
| 168 | - $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; | |
| 169 | - wp_enqueue_script( 'pll_widgets', plugins_url( '/js/widgets' . $suffix . '.js', POLYLANG_FILE ), array( 'jquery' ), POLYLANG_VERSION, true ); | |
| 170 | - $this->localize_scripts(); | |
| 171 | - } | |
| 172 | - } | |
| 173 | - | |
| 174 | - /** | |
| 175 | - * Localize scripts. | |
| 176 | - * | |
| 177 | - * @since 2.4.0 | |
| 178 | - */ | |
| 179 | - public function localize_scripts() { | |
| 180 | - if ( wp_script_is( 'pll_widgets', 'enqueued' ) ) { | |
| 181 | - wp_localize_script( | |
| 182 | - 'pll_widgets', | |
| 183 | - 'pll_widgets', | |
| 184 | - array( | |
| 185 | - 'flags' => wp_list_pluck( $this->model->get_languages_list(), 'flag', 'slug' ), | |
| 186 | - ) | |
| 187 | - ); | |
| 188 | - } | |
| 189 | - } | |
| 190 | - | |
| 191 | - /** | |
| 192 | 109 | * Sets pll_ajax_backend on all backend ajax request |
| 193 | 110 | * The final goal is to detect if an ajax request is made on admin or frontend |
| 194 | 111 | * |
| 195 | 112 | * Takes care to various situations: |
| @@ -202,9 +119,9 @@ | ||
| 202 | 119 | * |
| 203 | 120 | * @since 1.4 |
| 204 | 121 | */ |
| 205 | 122 | public function admin_print_footer_scripts() { |
| 206 | - global $post_ID, $tag_ID; | |
| 123 | + global $post_ID; | |
| 207 | 124 | |
| 208 | 125 | $params = array( 'pll_ajax_backend' => 1 ); |
| 209 | 126 | if ( ! empty( $post_ID ) ) { |
| 210 | 127 | $params = array_merge( $params, array( 'pll_post_id' => (int) $post_ID ) ); |
| @@ -209,47 +126,42 @@ | ||
| 209 | 126 | if ( ! empty( $post_ID ) ) { |
| 210 | 127 | $params = array_merge( $params, array( 'pll_post_id' => (int) $post_ID ) ); |
| 211 | 128 | } |
| 212 | 129 | |
| 213 | - if ( ! empty( $tag_ID ) ) { | |
| 214 | - $params = array_merge( $params, array( 'pll_term_id' => (int) $tag_ID ) ); | |
| 215 | - } | |
| 216 | - | |
| 217 | 130 | $str = http_build_query( $params ); |
| 218 | - $arr = wp_json_encode( $params ); | |
| 219 | - ?> | |
| 220 | - <script type="text/javascript"> | |
| 221 | - if (typeof jQuery != 'undefined') { | |
| 222 | - (function($){ | |
| 223 | - $.ajaxPrefilter(function (options, originalOptions, jqXHR) { | |
| 224 | - if ( -1 != options.url.indexOf( ajaxurl ) || -1 != ajaxurl.indexOf( options.url ) ) { | |
| 225 | - if ( 'undefined' === typeof options.data ) { | |
| 226 | - options.data = ( 'get' === options.type.toLowerCase() ) ? '<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>' : <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>; | |
| 131 | + $arr = json_encode( $params ); | |
| 132 | +?> | |
| 133 | +<script type="text/javascript"> | |
| 134 | + if (typeof jQuery != 'undefined') { | |
| 135 | + (function($){ | |
| 136 | + $.ajaxPrefilter(function (options, originalOptions, jqXHR) { | |
| 137 | + if ( -1 != options.url.indexOf( ajaxurl ) ) { | |
| 138 | + if ( 'undefined' === typeof options.data ) { | |
| 139 | + options.data = ( 'get' === options.type.toLowerCase() ) ? '<?php echo $str;?>' : <?php echo $arr;?>; | |
| 140 | + } else { | |
| 141 | + if ( 'string' === typeof options.data ) { | |
| 142 | + if ( '' === options.data && 'get' === options.type.toLowerCase() ) { | |
| 143 | + options.url = options.url+'&<?php echo $str;?>'; | |
| 227 | 144 | } else { |
| 228 | - if ( 'string' === typeof options.data ) { | |
| 229 | - if ( '' === options.data && 'get' === options.type.toLowerCase() ) { | |
| 230 | - options.url = options.url+'&<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>'; | |
| 231 | - } else { | |
| 232 | - try { | |
| 233 | - var o = $.parseJSON(options.data); | |
| 234 | - o = $.extend(o, <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>); | |
| 235 | - options.data = JSON.stringify(o); | |
| 236 | - } | |
| 237 | - catch(e) { | |
| 238 | - options.data = '<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>&'+options.data; | |
| 239 | - } | |
| 240 | - } | |
| 241 | - } else { | |
| 242 | - options.data = $.extend(options.data, <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>); | |
| 145 | + try { | |
| 146 | + o = $.parseJSON(options.data); | |
| 147 | + o = $.extend(o, <?php echo $arr;?>); | |
| 148 | + options.data = JSON.stringify(o); | |
| 243 | 149 | } |
| 150 | + catch(e) { | |
| 151 | + options.data = '<?php echo $str;?>&'+options.data; | |
| 152 | + } | |
| 244 | 153 | } |
| 154 | + } else { | |
| 155 | + options.data = $.extend(options.data, <?php echo $arr;?>); | |
| 245 | 156 | } |
| 246 | - }); | |
| 247 | - })(jQuery) | |
| 248 | - } | |
| 249 | - </script> | |
| 250 | - <?php | |
| 157 | + } | |
| 158 | + } | |
| 159 | + }); | |
| 160 | + })(jQuery) | |
| 251 | 161 | } |
| 162 | +</script><?php | |
| 163 | + } | |
| 252 | 164 | |
| 253 | 165 | /** |
| 254 | 166 | * Sets the admin current language, used to filter the content |
| 255 | 167 | * |
| @@ -258,24 +170,23 @@ | ||
| 258 | 170 | public function set_current_language() { |
| 259 | 171 | $this->curlang = $this->filter_lang; |
| 260 | 172 | |
| 261 | 173 | // Edit Post |
| 262 | - if ( isset( $_REQUEST['pll_post_id'] ) && $lang = $this->model->post->get_language( (int) $_REQUEST['pll_post_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 263 | - $this->curlang = $lang; | |
| 264 | - } elseif ( 'post.php' === $GLOBALS['pagenow'] && isset( $_GET['post'] ) && $this->model->is_translated_post_type( get_post_type( (int) $_GET['post'] ) ) && $lang = $this->model->post->get_language( (int) $_GET['post'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 265 | - $this->curlang = $lang; | |
| 266 | - } elseif ( 'post-new.php' === $GLOBALS['pagenow'] && ( empty( $_GET['post_type'] ) || $this->model->is_translated_post_type( sanitize_key( $_GET['post_type'] ) ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 267 | - $this->curlang = empty( $_GET['new_lang'] ) ? $this->pref_lang : $this->model->get_language( sanitize_key( $_GET['new_lang'] ) ); // phpcs:ignore WordPress.Security.NonceVerification | |
| 174 | + if ( isset( $_REQUEST['pll_post_id'] ) ) { | |
| 175 | + $this->curlang = $this->model->post->get_language( (int) $_REQUEST['pll_post_id'] ); | |
| 176 | + } elseif ( 'post.php' === $GLOBALS['pagenow'] && isset( $_GET['post'] ) && is_numeric( $_GET['post'] ) ) { | |
| 177 | + $this->curlang = $this->model->post->get_language( (int) $_GET['post'] ); | |
| 178 | + } elseif ( 'post-new.php' === $GLOBALS['pagenow'] ) { | |
| 179 | + $this->curlang = empty( $_GET['new_lang'] ) ? $this->pref_lang : $this->model->get_language( $_GET['new_lang'] ); | |
| 268 | 180 | } |
| 269 | 181 | |
| 270 | 182 | // Edit Term |
| 271 | - elseif ( isset( $_REQUEST['pll_term_id'] ) && $lang = $this->model->term->get_language( (int) $_REQUEST['pll_term_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 272 | - $this->curlang = $lang; | |
| 273 | - } elseif ( in_array( $GLOBALS['pagenow'], array( 'edit-tags.php', 'term.php' ) ) && isset( $_GET['taxonomy'] ) && $this->model->is_translated_taxonomy( sanitize_key( $_GET['taxonomy'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 274 | - if ( isset( $_GET['tag_ID'] ) && $lang = $this->model->term->get_language( (int) $_GET['tag_ID'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 275 | - $this->curlang = $lang; | |
| 276 | - } elseif ( ! empty( $_GET['new_lang'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 277 | - $this->curlang = $this->model->get_language( sanitize_key( $_GET['new_lang'] ) ); // phpcs:ignore WordPress.Security.NonceVerification | |
| 183 | + // FIXME 'edit-tags.php' for backward compatibility with WP < 4.5 | |
| 184 | + elseif ( in_array( $GLOBALS['pagenow'], array( 'edit-tags.php', 'term.php' ) ) && isset( $_GET['tag_ID'] ) ) { | |
| 185 | + $this->curlang = $this->model->term->get_language( (int) $_GET['tag_ID'] ); | |
| 186 | + } elseif ( 'edit-tags.php' === $GLOBALS['pagenow'] ) { | |
| 187 | + if ( ! empty( $_GET['new_lang'] ) ) { | |
| 188 | + $this->curlang = $this->model->get_language( $_GET['new_lang'] ); | |
| 278 | 189 | } elseif ( empty( $this->curlang ) ) { |
| 279 | 190 | $this->curlang = $this->pref_lang; |
| 280 | 191 | } |
| 281 | 192 | } |
| @@ -280,10 +191,10 @@ | ||
| 280 | 191 | } |
| 281 | 192 | } |
| 282 | 193 | |
| 283 | 194 | // Ajax |
| 284 | - if ( wp_doing_ajax() && ! empty( $_REQUEST['lang'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 285 | - $this->curlang = $this->model->get_language( sanitize_key( $_REQUEST['lang'] ) ); // phpcs:ignore WordPress.Security.NonceVerification | |
| 195 | + if ( defined( 'DOING_AJAX' ) && DOING_AJAX && ! empty( $_REQUEST['lang'] ) ) { | |
| 196 | + $this->curlang = $this->model->get_language( $_REQUEST['lang'] ); | |
| 286 | 197 | } |
| 287 | 198 | } |
| 288 | 199 | |
| 289 | 200 | /** |
| @@ -291,13 +202,15 @@ | ||
| 291 | 202 | * |
| 292 | 203 | * @since 1.2.3 |
| 293 | 204 | */ |
| 294 | 205 | public function init_user() { |
| 206 | + // Backend locale | |
| 207 | + add_filter( 'locale', array( $this, 'get_locale' ) ); | |
| 208 | + | |
| 295 | 209 | // Language for admin language filter: may be empty |
| 296 | 210 | // $_GET['lang'] is numeric when editing a language, not when selecting a new language in the filter |
| 297 | - // We intentionally don't use a nonce to update the language filter | |
| 298 | - if ( ! wp_doing_ajax() && ! empty( $_GET['lang'] ) && ! is_numeric( sanitize_key( $_GET['lang'] ) ) && current_user_can( 'edit_user', $user_id = get_current_user_id() ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 299 | - update_user_meta( $user_id, 'pll_filter_content', ( $lang = $this->model->get_language( sanitize_key( $_GET['lang'] ) ) ) ? $lang->slug : '' ); // phpcs:ignore WordPress.Security.NonceVerification | |
| 211 | + if ( ! defined( 'DOING_AJAX' ) && ! empty( $_GET['lang'] ) && ! is_numeric( $_GET['lang'] ) && current_user_can( 'edit_user', $user_id = get_current_user_id() ) ) { | |
| 212 | + update_user_meta( $user_id, 'pll_filter_content', ( $lang = $this->model->get_language( $_GET['lang'] ) ) ? $lang->slug : '' ); | |
| 300 | 213 | } |
| 301 | 214 | |
| 302 | 215 | $this->filter_lang = $this->model->get_language( get_user_meta( get_current_user_id(), 'pll_filter_content', true ) ); |
| 303 | 216 | |
| @@ -304,9 +217,9 @@ | ||
| 304 | 217 | // Set preferred language for use when saving posts and terms: must not be empty |
| 305 | 218 | $this->pref_lang = empty( $this->filter_lang ) ? $this->model->get_language( $this->options['default_lang'] ) : $this->filter_lang; |
| 306 | 219 | |
| 307 | 220 | /** |
| 308 | - * Filter the preferred language on admin side | |
| 221 | + * Filter the preferred language on amin side | |
| 309 | 222 | * The preferred language is used for example to determine the language of a new post |
| 310 | 223 | * |
| 311 | 224 | * @since 1.2.3 |
| 312 | 225 | * |
| @@ -317,14 +230,16 @@ | ||
| 317 | 230 | $this->set_current_language(); |
| 318 | 231 | |
| 319 | 232 | // Inform that the admin language has been set |
| 320 | 233 | // Only if the admin language is one of the Polylang defined language |
| 321 | - if ( $curlang = $this->model->get_language( get_user_locale() ) ) { | |
| 234 | + if ( $curlang = $this->model->get_language( get_locale() ) ) { | |
| 235 | + $GLOBALS['text_direction'] = $curlang->is_rtl ? 'rtl' : 'ltr'; // force text direction according to language setting | |
| 322 | 236 | /** This action is documented in frontend/choose-lang.php */ |
| 323 | 237 | do_action( 'pll_language_defined', $curlang->slug, $curlang ); |
| 324 | - } else { | |
| 238 | + } | |
| 239 | + else { | |
| 325 | 240 | /** This action is documented in include/class-polylang.php */ |
| 326 | - do_action( 'pll_no_language_defined' ); // to load overridden textdomains | |
| 241 | + do_action( 'pll_no_language_defined' ); // to load overriden textdomains | |
| 327 | 242 | } |
| 328 | 243 | } |
| 329 | 244 | |
| 330 | 245 | /** |
| @@ -329,9 +244,8 @@ | ||
| 329 | 244 | |
| 330 | 245 | /** |
| 331 | 246 | * Avoids parsing a tax query when all languages are requested |
| 332 | 247 | * Fixes https://wordpress.org/support/topic/notice-undefined-offset-0-in-wp-includesqueryphp-on-line-3877 introduced in WP 4.1 |
| 333 | - * | |
| 334 | 248 | * @see the suggestion of @boonebgorges, https://core.trac.wordpress.org/ticket/31246 |
| 335 | 249 | * |
| 336 | 250 | * @since 1.6.5 |
| 337 | 251 | * |
| @@ -346,8 +260,20 @@ | ||
| 346 | 260 | return $qvars; |
| 347 | 261 | } |
| 348 | 262 | |
| 349 | 263 | /** |
| 264 | + * Get the locale based on user preference | |
| 265 | + * | |
| 266 | + * @since 0.4 | |
| 267 | + * | |
| 268 | + * @param string $locale | |
| 269 | + * @return string modified locale | |
| 270 | + */ | |
| 271 | + public function get_locale( $locale ) { | |
| 272 | + return ( $loc = get_user_meta( get_current_user_id(), 'user_lang', 'true' ) ) ? $loc : $locale; | |
| 273 | + } | |
| 274 | + | |
| 275 | + /** | |
| 350 | 276 | * Adds the languages list in admin bar for the admin languages filter |
| 351 | 277 | * |
| 352 | 278 | * @since 0.9 |
| 353 | 279 | * |
| @@ -353,8 +279,10 @@ | ||
| 353 | 279 | * |
| 354 | 280 | * @param object $wp_admin_bar |
| 355 | 281 | */ |
| 356 | 282 | public function admin_bar_menu( $wp_admin_bar ) { |
| 283 | + $url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; | |
| 284 | + | |
| 357 | 285 | $all_item = (object) array( |
| 358 | 286 | 'slug' => 'all', |
| 359 | 287 | 'name' => __( 'Show all languages', 'polylang' ), |
| 360 | 288 | 'flag' => '<span class="ab-icon"></span>', |
| @@ -362,47 +290,30 @@ | ||
| 362 | 290 | |
| 363 | 291 | $selected = empty( $this->filter_lang ) ? $all_item : $this->filter_lang; |
| 364 | 292 | |
| 365 | 293 | $title = sprintf( |
| 366 | - '<span class="ab-label"%1$s><span class="screen-reader-text">%2$s</span>%3$s</span>', | |
| 294 | + '<span class="ab-label"%s>%s</span>', | |
| 367 | 295 | 'all' === $selected->slug ? '' : sprintf( ' lang="%s"', esc_attr( $selected->get_locale( 'display' ) ) ), |
| 368 | - __( 'Filters content by language', 'polylang' ), | |
| 369 | 296 | esc_html( $selected->name ) |
| 370 | 297 | ); |
| 371 | 298 | |
| 372 | - /** | |
| 373 | - * Filters the admin languages filter submenu items | |
| 374 | - * | |
| 375 | - * @since 2.6 | |
| 376 | - * | |
| 377 | - * @param array $items The admin languages filter submenu items. | |
| 378 | - */ | |
| 379 | - $items = apply_filters( 'pll_admin_languages_filter', array_merge( array( $all_item ), $this->model->get_languages_list() ) ); | |
| 299 | + $wp_admin_bar->add_menu( array( | |
| 300 | + 'id' => 'languages', | |
| 301 | + 'title' => $selected->flag . $title, | |
| 302 | + 'meta' => array( 'title' => __( 'Filters content by language', 'polylang' ) ), | |
| 303 | + ) ); | |
| 380 | 304 | |
| 381 | - if ( ! empty( $items ) ) { | |
| 382 | - $wp_admin_bar->add_menu( | |
| 383 | - array( | |
| 384 | - 'id' => 'languages', | |
| 385 | - 'title' => $selected->flag . $title, | |
| 386 | - 'href' => esc_url( add_query_arg( 'lang', $selected->slug, remove_query_arg( 'paged' ) ) ), | |
| 387 | - 'meta' => array( 'title' => __( 'Filters content by language', 'polylang' ) ), | |
| 388 | - ) | |
| 389 | - ); | |
| 390 | - } | |
| 391 | - | |
| 392 | - foreach ( $items as $lang ) { | |
| 305 | + foreach ( array_merge( array( $all_item ), $this->model->get_languages_list() ) as $lang ) { | |
| 393 | 306 | if ( $selected->slug === $lang->slug ) { |
| 394 | 307 | continue; |
| 395 | 308 | } |
| 396 | 309 | |
| 397 | - $wp_admin_bar->add_menu( | |
| 398 | - array( | |
| 399 | - 'parent' => 'languages', | |
| 400 | - 'id' => $lang->slug, | |
| 401 | - 'title' => $lang->flag . esc_html( $lang->name ), | |
| 402 | - 'href' => esc_url( add_query_arg( 'lang', $lang->slug, remove_query_arg( 'paged' ) ) ), | |
| 403 | - 'meta' => 'all' === $lang->slug ? array() : array( 'lang' => esc_attr( $lang->get_locale( 'display' ) ) ), | |
| 404 | - ) | |
| 405 | - ); | |
| 310 | + $wp_admin_bar->add_menu( array( | |
| 311 | + 'parent' => 'languages', | |
| 312 | + 'id' => $lang->slug, | |
| 313 | + 'title' => $lang->flag . esc_html( $lang->name ), | |
| 314 | + 'href' => esc_url( add_query_arg( 'lang', $lang->slug, remove_query_arg( 'paged', $url ) ) ), | |
| 315 | + 'meta' => 'all' === $lang->slug ? array() : array( 'lang' => esc_attr( $lang->get_locale( 'display' ) ) ), | |
| 316 | + ) ); | |
| 406 | 317 | } |
| 407 | 318 | } |
| 408 | 319 | } |
