Unverified Commit 95cfe641 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3477277 by fjgarlin, arunkumark, smustgrave, alexpott: Do not hardcode... 

Issue #3477277 by fjgarlin, arunkumark, smustgrave, alexpott: Do not hardcode URL in two places, use constant instead
parent 7951b091

core/includes/install.core.inc

+1 −1
Changes for core/includes/install.core.inc: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ function install_state_defaults() { 
    // The server URL where the interface translation files can be downloaded.

    // Tokens in the pattern will be replaced by appropriate values for the

    // required translation file.

    'server_pattern' => 'https://ftp.drupal.org/files/translations/%core/%project/%project-%version.%language.po',

    'server_pattern' => \Drupal::TRANSLATION_DEFAULT_SERVER_PATTERN,

    // Installation tasks can set this to TRUE to force the page request to

    // end (even if there is no themeable output), in the case of an interactive

    // installation. This is needed only rarely; for example, it would be used

core/lib/Drupal.php

+7 −0
Changes for core/lib/Drupal.php: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -133,6 +133,13 @@ class Drupal { 
   */

  const RECOMMENDED_PHP = '8.3.0';



  /**

   * Default location of gettext file on the translation server.

   *

   * @see locale_translation_default_translation_server()

   */

  const TRANSLATION_DEFAULT_SERVER_PATTERN = 'https://ftp.drupal.org/files/translations/%core/%project/%project-%version.%language.po';



  /**

   * The currently active container object, or NULL if not initialized yet.

   *

core/modules/locale/locale.compare.inc

+1 −3
Changes for core/modules/locale/locale.compare.inc: 1 added line, 3 removed lines.
Original line number Diff line number Diff line
@@ -161,10 +161,8 @@ function locale_translation_default_translation_server() { 
  // An additional check is required here. During the upgrade process

  // \Drupal::config()->get() returns NULL. We use the defined value as

  // fallback.

  $pattern = $pattern ? $pattern : LOCALE_TRANSLATION_DEFAULT_SERVER_PATTERN;



  return [

    'pattern' => $pattern,

    'pattern' => $pattern ?: \Drupal::TRANSLATION_DEFAULT_SERVER_PATTERN,

  ];

}

core/modules/locale/locale.module

+6 −2
Changes for core/modules/locale/locale.module: 6 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -92,9 +92,13 @@ 
/**

 * Default location of gettext file on the translation server.

 *

 * @see locale_translation_default_translation_server().

 * @deprecated in drupal:11.2.0 and is removed from drupal:12.0.0. Use

 *   \Drupal::TRANSLATION_DEFAULT_SERVER_PATTERN instead.

 *

 * @see https://www.drupal.org/node/3488133

 * @see locale_translation_default_translation_server()

 */

const LOCALE_TRANSLATION_DEFAULT_SERVER_PATTERN = 'https://ftp.drupal.org/files/translations/%core/%project/%project-%version.%language.po';

const LOCALE_TRANSLATION_DEFAULT_SERVER_PATTERN = \Drupal::TRANSLATION_DEFAULT_SERVER_PATTERN;



/**

 * The number of seconds that the translations status entry should be considered.