QTS: merge qts textdomain to qtranslate, update l10n (#1120)

* remove qts textdomain, merge with qtranslate, cleanup
* update all po/mo files with new pot file, include existing qts translations

modules/slugs/includes/class-qtranslate-slug.php

@@ -164,8 +164,6 @@ function init() {
             return;
         }
 
-        load_plugin_textdomain( 'qts', false, basename( plugin_dir_path( dirname( __FILE__ ) ) ) . '/languages' );
-
         if ( is_admin() ) {
             include_once( dirname( __FILE__ ) . '/qtranslate-slug-settings.php' );
         }
@@ -917,6 +915,7 @@ public function _get_page_link( $link, $id ) {
      *
      * @return string the link translated
      */
+    //TODO: review this function vs get_term_link(), e.g. checks and error handling may be unneeded here
     public function term_link( $link, $term, $taxonomy ) {
         global $wp_rewrite;
 
@@ -934,7 +933,7 @@ public function term_link( $link, $term, $taxonomy ) {
         }
 
         if ( ! is_object( $term ) ) {
-            $term = new WP_Error( 'invalid_term', __( 'Empty Term', 'qts' ) );
+            $term = new WP_Error( 'invalid_term', __( 'Empty Term' ) );
         }
 
         if ( is_wp_error( $term ) ) {
@@ -1113,17 +1112,17 @@ public function add_slug_meta_box() {
             $context  = apply_filters( "qts_admin_meta_box_context", "side" );
             $priority = apply_filters( "qts_admin_meta_box_priority", "high" );
 
-            add_meta_box( 'qts_sectionid', __( 'Slug QTS', 'qts' ), array(
+            add_meta_box( 'qts_sectionid', __( 'Slugs per language', 'qtranslate' ), array(
                 &$this,
                 'draw_meta_box'
             ), 'post', $context, $priority );
-            add_meta_box( 'qts_sectionid', __( 'Slug  QTS', 'qts' ), array(
+            add_meta_box( 'qts_sectionid', __( 'Slugs per language', 'qtranslate' ), array(
                 &$this,
                 'draw_meta_box'
             ), 'page', $context, $priority );
 
             foreach ( get_post_types( array( '_builtin' => false ) ) as $ptype ) {
-                add_meta_box( 'qts_sectionid', __( 'Slug  QTS', 'qts' ), array(
+                add_meta_box( 'qts_sectionid', __( 'Slugs per language', 'qtranslate' ), array(
                     &$this,
                     'draw_meta_box'
                 ), $ptype, $context, $priority );
@@ -1322,7 +1321,7 @@ public function show_term_fields( $term ) {
                 $value = ( $slug ) ? htmlspecialchars( $slug, ENT_QUOTES ) : '';
 
                 echo "<tr class=\"form-field form-required\">" . PHP_EOL;
-                echo "<th scope=\"row\"><label for=\"qts_{$lang}_slug\">" . sprintf( __( 'Slug (%s)', 'qts' ), $q_config['language_name'][ $lang ] ) . "</label></th>" . PHP_EOL;
+                echo "<th scope=\"row\"><label for=\"qts_{$lang}_slug\">" . sprintf( __( 'Slug' ) . ' (%s)', $q_config['language_name'][ $lang ] ) . "</label></th>" . PHP_EOL;
                 echo "<td><input type=\"text\" name=\"qts_{$lang}_slug\" value=\"" . urldecode( $value ) . "\" /></td></tr>" . PHP_EOL;
 
             }
@@ -1341,7 +1340,7 @@ public function show_term_fields( $term ) {
 
                 $value = ( $slug ) ? htmlspecialchars( $slug, ENT_QUOTES ) : '';
 
-                echo "<label for=\"qts_{$lang}_slug\">" . sprintf( __( 'Slug (%s)', 'qts' ), $q_config['language_name'][ $lang ] ) . "</label>" . PHP_EOL;
+                echo "<label for=\"qts_{$lang}_slug\">" . sprintf( __( 'Slug' ) . ' (%s)', $q_config['language_name'][ $lang ] ) . "</label>" . PHP_EOL;
                 echo "<input type=\"text\" name=\"qts_{$lang}_slug\" value=\"" . urldecode( $value ) . "\" aria-required=\"true\">" . PHP_EOL;
                 echo '</div>';
             }
@@ -1510,8 +1509,8 @@ public function taxonomy_columns( $columns ) {
         unset( $columns['slug'] );
         unset( $columns['posts'] );
 
-        $columns['qts-slug'] = __( 'Slug', 'qts' );
-        $columns['posts']    = __( 'Posts', 'qts' );
+        $columns['qts-slug'] = __( 'Slug' );
+        $columns['posts']    = __( 'Posts' );
 
         return $columns;
     }
@@ -1750,6 +1749,7 @@ private function ignore_rewrite_caller() {
      *
      * @return string
      */
+    //TODO: $link seems to be unused (always false), to be removed and function cleaned up
     private function get_category_parents( $id, $link = false, $separator = '/', $nicename = false, $visited = array() ) {
         $chain  = '';
         $parent = get_category( $id );

modules/slugs/includes/qtranslate-slug-settings-options.php

@@ -6,8 +6,8 @@
  */
 function qts_options_page_sections() {
     $sections               = array();
-    $sections['post_types'] = __( 'Post types', 'qts' );
-    $sections['taxonomies'] = __( 'Taxonomies', 'qts' );
+    $sections['post_types'] = __( 'Post types', 'qtranslate' );
+    $sections['taxonomies'] = __( 'Taxonomies', 'qtranslate' );
 
     return $sections;
 }
@@ -22,7 +22,7 @@ function get_multi_txt_choices() {
 
     $choices = array();
     foreach ( $q_config['enabled_languages'] as $lang ) {
-        $label     = sprintf( __( 'Slug', 'qts' ) . ' (%s)', $q_config['language_name'][ $lang ] );
+        $label     = sprintf( __( 'Slug' ) . ' (%s)', $q_config['language_name'][ $lang ] );
         $choices[] = "$label|$lang"; // prints: 'Slug (English)|en'
     }
 

modules/slugs/includes/qtranslate-slug-settings.php

@@ -24,11 +24,11 @@ function qts_get_settings() {
 function qts_section_fn( $section_id = '' ) {
     switch ( $section_id ) {
         case 'post_types':
-            echo "<p>" . __( 'For example, the post_type <kbd>books</kbd>, in Spanish would be displayed as <code>https://example.org/es/libros/post-type-name/</code>. If you leave this blank will use the default option when you <a href="https://developer.wordpress.org/reference/functions/register_post_type/">registered</a> the post_type.', 'qts' ) . "</p>";
+            echo "<p>" . __( 'For example, the post_type <kbd>books</kbd>, in Spanish would be displayed as <code>https://example.org/es/libros/post-type-name/</code>. If you leave this blank will use the default option when you <a href="https://developer.wordpress.org/reference/functions/register_post_type/">registered</a> the post_type.', 'qtranslate' ) . "</p>";
             break;
 
         case 'taxonomies':
-            echo "<p>" . __( 'For example, the taxonomy <kbd>category</kbd>, in Spanish would be displayed as <code>https://example.org/es/categoria/taxonomy-name/</code>. If you leave this blank will use the default option when you <a href="https://developer.wordpress.org/reference/functions/register_taxonomy/">registered</a> the taxonomy (if you previously setup a base permastruct for <u>categories</u> or <u>tags</u> in <a href="options-permalink.php">permalinks</a> page, these bases will be overwritten by the translated ones).', 'qts' ) . "</p>";
+            echo "<p>" . __( 'For example, the taxonomy <kbd>category</kbd>, in Spanish would be displayed as <code>https://example.org/es/categoria/taxonomy-name/</code>. If you leave this blank will use the default option when you <a href="https://developer.wordpress.org/reference/functions/register_taxonomy/">registered</a> the taxonomy (if you previously setup a base permastruct for <u>categories</u> or <u>tags</u> in <a href="options-permalink.php">permalinks</a> page, these bases will be overwritten by the translated ones).', 'qtranslate' ) . "</p>";
             break;
     }
 }
@@ -74,7 +74,7 @@ function qts_show_form_field( $args = array() ) {
         case "multi-text":
             foreach ( $choices as $item ) {
                 $item    = explode( "|", $item ); // cat_name|cat_slug
-                $item[0] = esc_html__( $item[0], 'qts' );
+                $item[0] = esc_html( $item[0] );
 
                 if ( ! empty( $options[ $id ] ) ) {
                     foreach ( $options[ $id ] as $option_key => $option_val ) {
@@ -102,8 +102,8 @@ function qts_show_form_field( $args = array() ) {
         case 'select':
             echo "<select id='$id' class='select$field_class' name='" . QTS_OPTIONS_NAME . "[$id]'>";
             foreach ( $choices as $item ) {
-                $value = esc_attr( $item, 'qts' );
-                $item  = esc_html( $item, 'qts' );
+                $value = esc_attr( $item );
+                $item  = esc_html( $item );
 
                 $selected = ( $options[ $id ] == $value ) ? 'selected="selected"' : '';
                 echo "<option value='$value' $selected>$item</option>";
@@ -117,7 +117,7 @@ function qts_show_form_field( $args = array() ) {
             foreach ( $choices as $item ) {
 
                 $item    = explode( "|", $item );
-                $item[0] = esc_html( $item[0], 'qts' );
+                $item[0] = esc_html( $item[0] );
 
                 $selected = ( $options[ $id ] == $item[1] ) ? 'selected="selected"' : '';
                 echo "<option value='$item[1]' $selected>$item[0]</option>";
@@ -135,7 +135,7 @@ function qts_show_form_field( $args = array() ) {
             foreach ( $choices as $item ) {
 
                 $item    = explode( "|", $item );
-                $item[0] = esc_html( $item[0], 'qts' );
+                $item[0] = esc_html( $item[0] );
 
                 $checked = '';
 
@@ -154,8 +154,8 @@ function qts_show_form_field( $args = array() ) {
             foreach ( $choices as $index => $item ) {
 
                 $item       = explode( "|", $item );
-                $item_key   = ( count( $item ) > 1 ) ? esc_html( $item[0], 'qts' ) : esc_html( end( $item ), 'qts' );
-                $item_value = ( count( $item ) > 1 ) ? esc_html( $item[1], 'qts' ) : esc_html( end( $item ), 'qts' );
+                $item_key   = ( count( $item ) > 1 ) ? esc_html( $item[0] ) : esc_html( end( $item ) );
+                $item_value = ( count( $item ) > 1 ) ? esc_html( $item[1] ) : esc_html( end( $item ) );
 
                 $checked = '';
 
@@ -190,7 +190,7 @@ function qts_show_settings_page() {
     }
     QTX_Admin_Settings::open_section( 'slugs' );
     ?>
-    <p class="heading"><?php _e( 'If you activated previously the <a href="options-permalink.php">pretty permalinks</a>, in this section you can translate the <abbr title="en inglés, Universal Resource Locator">URLs</abbr> <strong>bases</strong> for <a href="https://developer.wordpress.org/reference/functions/register_post_type/#parameters">public</a> post_types, categories, tags and taxonomies.', 'qts' ); ?> </p>
+    <p class="heading"><?php _e( 'If you activated previously the <a href="options-permalink.php">pretty permalinks</a>, in this section you can translate the <abbr title="en inglés, Universal Resource Locator">URLs</abbr> <strong>bases</strong> for <a href="https://developer.wordpress.org/reference/functions/register_post_type/#parameters">public</a> post_types, categories, tags and taxonomies.', 'qtranslate' ); ?> </p>
 
     <?php foreach ( $settings_output['qts_page_sections'] as $id => $title ) { ?>
         <h2><?php echo $title; ?></h2>
@@ -219,8 +219,7 @@ function qts_validate_options( $input ) {
     foreach ( $q_config['enabled_languages'] as $lang ) {
         $slugs_lookup_array[ $lang ] = array();
     }
-    // TODO: errors are not displayed, earlier hook to be evaluated
-    $errors      = &$q_config['url_info']['errors'];
+
     $valid_input = array();
 
     // collect only the values we expect and fill the new $valid_input array
@@ -240,10 +239,6 @@ function qts_validate_options( $input ) {
                         // accept the input only when numeric!
                         $input[ $option['id'] ]       = trim( $input[ $option['id'] ] ); // trim whitespace
                         $valid_input[ $option['id'] ] = ( is_numeric( $input[ $option['id'] ] ) ) ? $input[ $option['id'] ] : 'Expecting a Numeric value!';
-                        // register error
-                        if ( is_numeric( $input[ $option['id'] ] ) == false ) {
-                            $errors[] = $option['id'] . ': ' . __( 'Expecting a Numeric value! Please fix.', 'qts' );
-                        }
                         break;
                     default:
                         // accept the input only after stripping out all html, extra white space etc!
@@ -346,8 +341,6 @@ function qts_validate_options( $input ) {
                     $valid_input[ $option['id'] ] = $checkboxarray;
                 }
                 break;
-            default:
-                $errors[] = $option['id'] . ': ' . __( 'Unknown field type.', 'qts' );
         endswitch;
     endforeach;