| @@ -2,13 +2,13 @@ | ||
| 2 | 2 | /** |
| 3 | 3 | * Displays the languages tab in Polylang settings |
| 4 | 4 | * |
| 5 | 5 | * @package Polylang |
| 6 | + * | |
| 7 | + * @var PLL_Table_Languages $list_table An object representing the languages list table. | |
| 6 | 8 | */ |
| 7 | 9 | |
| 8 | -if ( ! defined( 'ABSPATH' ) ) { | |
| 9 | - exit; // Don't access directly | |
| 10 | -}; | |
| 10 | +defined( 'ABSPATH' ) || exit; | |
| 11 | 11 | ?> |
| 12 | 12 | <div id="col-container"> |
| 13 | 13 | <div id="col-right"> |
| 14 | 14 | <div class="col-wrap"> |
| @@ -53,20 +53,17 @@ | ||
| 53 | 53 | <label for="lang_list"><?php esc_html_e( 'Choose a language', 'polylang' ); ?></label> |
| 54 | 54 | <select name="lang_list" id="lang_list"> |
| 55 | 55 | <option value=""></option> |
| 56 | 56 | <?php |
| 57 | - foreach ( $this->get_predefined_languages() as $lg ) { | |
| 58 | - $lg['flag_code'] = $lg['flag']; | |
| 59 | - $language = new PLL_Language( $lg ); | |
| 60 | - $language->set_flag(); | |
| 57 | + foreach ( PLL_Settings::get_predefined_languages() as $language ) { | |
| 61 | 58 | printf( |
| 62 | 59 | '<option value="%1$s:%2$s:%3$s:%4$s" data-flag-html="%6$s">%5$s - %2$s</option>' . "\n", |
| 63 | - esc_attr( $lg['code'] ), | |
| 64 | - esc_attr( $lg['locale'] ), | |
| 65 | - 'rtl' == $lg['dir'] ? '1' : '0', | |
| 66 | - esc_attr( $lg['flag'] ), | |
| 67 | - esc_html( $lg['name'] ), | |
| 68 | - esc_html( $language->flag ) | |
| 60 | + esc_attr( $language['code'] ), | |
| 61 | + esc_attr( $language['locale'] ), | |
| 62 | + 'rtl' == $language['dir'] ? '1' : '0', | |
| 63 | + esc_attr( $language['flag'] ), | |
| 64 | + esc_html( $language['name'] ), | |
| 65 | + esc_attr( PLL_Language::get_predefined_flag( $language['flag'] ) ) | |
| 69 | 66 | ); |
| 70 | 67 | } |
| 71 | 68 | ?> |
| 72 | 69 | </select> |
| @@ -106,9 +103,9 @@ | ||
| 106 | 103 | <p><?php esc_html_e( 'Language code - preferably 2-letters ISO 639-1 (for example: en)', 'polylang' ); ?></p> |
| 107 | 104 | </div> |
| 108 | 105 | |
| 109 | 106 | <div class="form-field"><fieldset> |
| 110 | - <legend><?php esc_html_e( 'Text direction', 'polylang' ); ?></legend> | |
| 107 | + <legend class="pll-legend"><?php esc_html_e( 'Text direction', 'polylang' ); ?></legend> | |
| 111 | 108 | <?php |
| 112 | 109 | printf( |
| 113 | 110 | '<label><input name="rtl" type="radio" value="0" %s /> %s</label>', |
| 114 | 111 | checked( ! empty( $edit_lang ) && $edit_lang->is_rtl, false, false ), |
| @@ -132,9 +129,9 @@ | ||
| 132 | 129 | foreach ( $flags as $code => $label ) { |
| 133 | 130 | printf( |
| 134 | 131 | '<option value="%s" data-flag-html="%s"%s>%s</option>' . "\n", |
| 135 | 132 | esc_attr( $code ), |
| 136 | - esc_html( PLL_Language::get_flag_html( PLL_Language::get_flag_informations( $code ) ) ), | |
| 133 | + esc_html( PLL_Language::get_flag_html( PLL_Language::get_flag_information( $code ) ) ), | |
| 137 | 134 | selected( isset( $edit_lang->flag_code ) && $edit_lang->flag_code === $code, true, false ), |
| 138 | 135 | esc_html( $label ) |
| 139 | 136 | ); |
| 140 | 137 | } |
| @@ -159,9 +156,9 @@ | ||
| 159 | 156 | * Fires after the Edit Language form fields are displayed. |
| 160 | 157 | * |
| 161 | 158 | * @since 1.7.10 |
| 162 | 159 | * |
| 163 | - * @param object $lang language being edited. | |
| 160 | + * @param PLL_Language $lang language being edited. | |
| 164 | 161 | */ |
| 165 | 162 | do_action( 'pll_language_edit_form_fields', $edit_lang ); |
| 166 | 163 | } else { |
| 167 | 164 | /** |