WordPress.org
Get WordPress

Plugin Directory

Changeset 2903708


Ignore:
Timestamp:
04/25/2023 08:17:01 AM (3 years ago)
Author:
frpet
Message:

Fix target languages as source

Location:
easytranslate/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • easytranslate/trunk/README.txt

    r2900808 r2903708  
    55Requires at least: 4.7
    66Tested up to: 6.1
    7 Stable tag: 4.16
     7Stable tag: 4.17
    88License: GPLv2 or later
    99License URI: https://www.gnu.org/licenses/gpl-2.0.html

  • easytranslate/trunk/admin/class-easy-translate-api-laas.php

    r2678526 r2903708  
    5353            ],
    5454        ]);
     55
    5556        $response = $this->wp_remote_post(
    5657            $path,

  • easytranslate/trunk/admin/class-easy-translate-post-translation-list.php

    r2900808 r2903708  
    345345            $service = new Easy_Translate_API_Laas(Easy_Translate_API_Integration::map_fields($options));
    346346            $response = $service->translate(
    347                 $this->source_language,
     347                $_REQUEST['source_language'] ?? $this->source_language,
    348348                array_keys($_REQUEST['target_languages']),
    349349                $content,

  • easytranslate/trunk/admin/class-easy-translate-translation-list.php

    r2867888 r2903708  
    355355     * @return array
    356356     */
    357     public function get_strings_content($ids, string $source_language = null)
     357    public function get_strings_content($ids,  string $source_language = null)
    358358    {
    359359        global $wpdb;
    360360        $content = [];
    361361        $id_in = '"' . implode('","', $ids) . '"';
     362//        $query = "SELECT id, value from {$wpdb->prefix}icl_strings WHERE id IN ({$id_in})";
     363
    362364        $select = "str.id, str.value";
    363365        $where = "str.id IN ({$id_in})";
    … …  
    369371        }
    370372        $query = "SELECT {$select} from {$wpdb->prefix}icl_strings as str {$join} WHERE {$where}";
     373
    371374        $result = $wpdb->get_results($query, ARRAY_A);
    372 
    373375        foreach ($result as $item) {
    374376            $content['strings'][$item['id']] = $item['value'];
    … …  
    656658        $package_id = self::get_post_package_id($post_id);
    657659        $post = get_post($post_id);
     660
    658661        $source_language = esc_sql($_REQUEST['source_language'] ?? null);
    659662
    … …  
    732735     * @return array|object|null
    733736     */
    734     protected static function get_strings_by_package_id($package_id, $updated = false, string $source_language = null)
     737    protected static function get_strings_by_package_id($package_id, $updated = false, $source_language = null)
    735738    {
    736739        global $wpdb;
    737740        $package_id = esc_sql($package_id);
     741//        $query = "SELECT id, value FROM {$wpdb->prefix}icl_strings WHERE string_package_id='{$package_id}';";
    738742        $select = "str.id, str.value";
    739743        $where = "str.string_package_id='{$package_id}'";

  • easytranslate/trunk/admin/partials/translation-options.php

    r2867888 r2903708  
    5858          <option value="translation"><?= __('Translation', EASY_TRANSLATE) ?> (<?= __('default', EASY_TRANSLATE) ?>)
    5959          </option>
    60           <option value="self+machine_translation" selected="selected"><?= __('Machine Translation', EASY_TRANSLATE) ?></option>
     60            <option value="self+machine_translation" selected="selected"><?= __('Machine Translation', EASY_TRANSLATE) ?></option>
    6161        </select>
    6262      </div>
    6363
    64       <div style="margin-bottom: .5rem;">
    65         <label for="source_language">Select source language: </label>
    66         <select name="source_language" id="source_language">
    67           <option value="<?= $this->source_language ?>" selected="selected"><?= $this->source_language ?> (default)</option>
    68             <?php
    69             /** @var Easy_Translate_Translation_List $this */
    70             foreach ($this->get_language_name($this->translation_languages) as $target_language) { ?>
    71               <option value="<?= $target_language['code'] ?>"><?= $target_language['code'] ?></option>
    72             <?php } ?>
    73         </select>
    74         <small>This is an experimental feature. Expect unusual behaviour if the default source language is changed</small>
    75       </div>
     64        <div style="margin-bottom: .5rem;">
     65            <label for="source_language">Select source language: </label>
     66            <select name="source_language" id="source_language">
     67                <option value="<?= $this->source_language ?>" selected="selected"><?= $this->source_language ?> (default)</option>
     68                <?php
     69                /** @var Easy_Translate_Translation_List $this */
     70                foreach ($this->get_language_name($this->translation_languages) as $target_language) { ?>
     71                    <option value="<?= $target_language['code'] ?>"><?= $target_language['code'] ?></option>
     72                <?php } ?>
     73            </select>
     74            <small>This is an experimental feature. Expect unusual behaviour if the default source language is changed</small>
     75        </div>
    7676
    7777      <button class="button-primary" type="submit" value="translate_strings"

  • easytranslate/trunk/easy-translate.php

    r2900808 r2903708  
    1515 * Plugin URI:        https://www.easytranslate.com/en/integrations/cms/wordpress-plugin/
    1616 * Description:       This is a short description of what the plugin does. It's displayed in the WordPress admin area.
    17  * Version:           1.10.2
     17 * Version:           1.10.3
    1818 * Author:            EasyTranslate
    1919 * Author URI:        https://easytranslate.com
    … …  
    3434 * Rename this for your plugin and update it as you release new versions.
    3535 */
    36 define('EASY_TRANSLATE_VERSION', '1.10.2');
     36define('EASY_TRANSLATE_VERSION', '1.10.3');
    3737
    3838/**
Note: See TracChangeset for help on using the changeset viewer.