diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateBase.php b/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateBase.php index 2b75e60..ec9e74f 100644 --- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateBase.php +++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateBase.php @@ -130,8 +130,8 @@ protected function makePoFile($path, $filename, $timestamp = NULL, $translations 'timestamp' => $timestamp, 'status' => FILE_STATUS_PERMANENT, )); - file_put_contents($file->uri, $po_header . $text); - touch(drupal_realpath($file->uri), $timestamp); + file_put_contents($file->getFileUri(), $po_header . $text); + touch(drupal_realpath($file->getFileUri()), $timestamp); $file->save(); } diff --git a/core/modules/locale/locale.batch.inc b/core/modules/locale/locale.batch.inc index 825a332..91b7555 100644 --- a/core/modules/locale/locale.batch.inc +++ b/core/modules/locale/locale.batch.inc @@ -35,7 +35,6 @@ * The batch context. */ function locale_translation_batch_status_check($project, $langcode, $options = array(), &$context) { - $t = get_t(); $failure = $checked = FALSE; $options += array( 'finish_feedback' => TRUE, @@ -81,7 +80,7 @@ function locale_translation_batch_status_check($project, $langcode, $options = a if ($failure && !$checked) { $context['results']['failed_files'][] = $source->name; } - $context['message'] = $t('Checked translation for %project.', array('%project' => $source->project)); + $context['message'] = t('Checked translation for %project.', array('%project' => $source->project)); } /** @@ -140,9 +139,8 @@ function locale_translation_batch_fetch_download($project, $langcode, &$context) if (isset($sources[$project][$langcode])) { $source = $sources[$project][$langcode]; if (isset($source->type) && $source->type == LOCALE_TRANSLATION_REMOTE) { - $t = get_t(); if ($file = locale_translation_download_source($source->files[LOCALE_TRANSLATION_REMOTE], 'translations://')) { - $context['message'] = $t('Downloaded translation for %project.', array('%project' => $source->project)); + $context['message'] = t('Downloaded translation for %project.', array('%project' => $source->project)); locale_translation_status_save($source->name, $source->langcode, LOCALE_TRANSLATION_LOCAL, $file); } else { @@ -176,7 +174,6 @@ function locale_translation_batch_fetch_import($project, $langcode, $options, &$ $source = $sources[$project][$langcode]; if (isset($source->type)) { if ($source->type == LOCALE_TRANSLATION_REMOTE || $source->type == LOCALE_TRANSLATION_LOCAL) { - $t = get_t(); $file = $source->files[LOCALE_TRANSLATION_LOCAL]; module_load_include('bulk.inc', 'locale'); $options += array( diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc index 522d776..8ebdb27 100644 --- a/core/modules/locale/locale.pages.inc +++ b/core/modules/locale/locale.pages.inc @@ -525,7 +525,7 @@ function locale_translation_status_form($form, &$form_state) { $updates[$langcode]['updates'][] = array( 'name' => $project_data[$project_info->name]->info['name'], 'version' => $project_info->version, - 'timestamp' => $recent->timestamp, + 'timestamp' => $recent->getChangedTime(), ); $languages_update[$langcode] = $langcode; $projects_update[$project_info->name] = $project_info->name;