fix: review feedback

Codeinwp · Jan 31, 2025 · 91cc333 · 91cc333
1 parent ad48bff
commit 91cc333
Showing 1 changed file with 29 additions and 14 deletions.
diff --git a/includes/admin/class-rop-admin.php b/includes/admin/class-rop-admin.php
@@ -1575,22 +1575,11 @@ public function rop_get_wpml_languages() {
 			return;
 		}
 
-		$wpml_active_languages = apply_filters( 'wpml_active_languages', null, array('skip_missing' => 1) );
-
-		// Get TranslatePress publish plugin languages.
-		if ( empty( $wpml_active_languages ) && class_exists( 'TRP_Translate_Press' ) ) {
-			$trp_settings = TRP_Translate_Press::get_trp_instance()->get_component( 'settings' )->get_settings();
-			if ( $trp_settings ) {
-				$trp_languages         = TRP_Translate_Press::get_trp_instance()->get_component( 'languages' );
-				$publish_languages     = ! empty( $trp_settings['publish-languages'] ) ? $trp_settings['publish-languages'] : array();
-				$wpml_active_languages = $trp_languages->get_language_names( $publish_languages, 'english_name' );
-			}
-		}
+		$languages       = $this->get_languages();
 		$languages_array = array();
 
-		foreach ( $wpml_active_languages as $key => $value ) {
-			$key               = false !== strpos( $key, '_' ) ? substr( $key, 0, strpos( $key, '_' ) ) : $key;
-			$languages_array[] = array( 'code' => $key, 'label' => isset( $value['native_name'] ) ? $value['native_name'] : $value );
+		foreach ( $languages as $key => $value ) {
+			$languages_array[] = array( 'code' => $key, 'label' => $value['native_name'] );
 		}
 		return $languages_array;
 	}
@@ -1821,4 +1810,30 @@ public function rop_upgrade_to_pro_plugin_action( $actions, $plugin_file ) {
 
 		return $actions;
 	}
+
+	/**
+	 * Get available languages.
+	 *
+	 * @return array
+	 */
+	public function get_languages() {
+		// Get TranslatePress publish plugin languages.
+		if ( class_exists( 'TRP_Translate_Press' ) ) {
+			$trp_settings = TRP_Translate_Press::get_trp_instance()->get_component( 'settings' )->get_settings();
+			if ( $trp_settings ) {
+				$trp_languages     = TRP_Translate_Press::get_trp_instance()->get_component( 'languages' );
+				$publish_languages = ! empty( $trp_settings['publish-languages'] ) ? $trp_settings['publish-languages'] : array();
+				$publish_languages = $trp_languages->get_language_names( $publish_languages, 'native_name' );
+				$languages         = array();
+				foreach ( $publish_languages as $key => $publish_language ) {
+					$key               = false !== strpos( $key, '_' ) ? substr( $key, 0, strpos( $key, '_' ) ) : $key;
+					$languages[ $key ] = array(
+						'native_name' => $publish_language,
+					);
+				}
+				return $languages;
+			}
+		}
+		return apply_filters( 'wpml_active_languages', null, array( 'skip_missing' => 1 ) );
+	}
 }