Commit c1b8ce65 authored by Andrey Nuzhdov's avatar Andrey Nuzhdov
Browse files

refs #823596 Configurable Import Mode added.

parent 33683e1d

live_translation.admin.inc

+7 −1
Original line number Diff line number Diff line
@@ -53,6 +53,12 @@ function _live_translation_settings() { 
      '#title'         => $language->native,

      '#type'          => 'textfield',

    );

    $form['live_translation_servers'][$langcode.'_import_mode'] = array(

      '#title'         => t('Import mode'),

      '#type'          => 'select',

      '#options'       => array(LOCALE_IMPORT_OVERWRITE => t('Overwrite'), LOCALE_IMPORT_KEEP => t('Keep')),

      '#default_value' => variable_get($langcode.'_import_mode', LOCALE_IMPORT_KEEP),

    );

  }

  return system_settings_form($form);

}
@@ -77,7 +83,7 @@ function theme_live_translation_report($data) { 
    $rows = array();

    $collapsed = TRUE;

    foreach ($language as $mod => $module) {

      if ($module['status'] == LIVE_TRANSLATION_STATUS_OUTDATE) {

      if (($module['status'] == LIVE_TRANSLATION_STATUS_OUTDATE) || ($module['status'] == LIVE_TRANSLATION_STATUS_UNKNOWN)) {

        $status = l(t('Outdated: !strings new strings', array('!strings' => $module['strings'])), "admin/reports/live-translation/import/$mod/$langcode");

        $collapsed = FALSE;

      }

live_translation.update.inc

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ function _live_translation_import($module, $langcode, $batch = false) { 
    include_once './includes/locale.inc';

    // LOCALE_IMPORT_OVERWRITE

    // LOCALE_IMPORT_KEEP

    $mode = LOCALE_IMPORT_OVERWRITE;

    $mode = variable_get($langcode.'_import_mode', LOCALE_IMPORT_KEEP);



    // 'default'

    $group = 'default';