Merge remote-tracking branch 'origin/MOODLE_36_STABLE'

Author: mudrd8mz

admin/newlanguage.php

@@ -38,7 +38,7 @@
 $form = new local_amos_newlanguage_form();
 
 if ($data = $form->get_data()) {
-    $component = new mlang_component('langconfig', $data->langcode, mlang_version::by_code(mlang_version::MOODLE_39));
+    $component = new mlang_component('langconfig', $data->langcode, mlang_version::by_code(mlang_version::MOODLE_40));
     $data->langname = mlang_string::fix_syntax($data->langname);
     $data->langnameint = mlang_string::fix_syntax($data->langnameint);
     $component->add_string(new mlang_string('thislanguage', $data->langname));

cli/export-installer.php

@@ -40,6 +40,7 @@
     'MOODLE_37_STABLE',
     'MOODLE_38_STABLE',
     'MOODLE_39_STABLE',
+    'MOODLE_40_STABLE',
 );
 
 fputs(STDOUT, "*****************************************\n");
@@ -50,7 +51,7 @@
 
 foreach ($branches as $branch) {
     fputs(STDOUT, "BRANCH {$branch}\n");
-    if ($branch == 'MOODLE_39_STABLE') {
+    if ($branch == 'MOODLE_40_STABLE') {
         $gitbranch = 'origin/master';
     } else {
         $gitbranch = 'origin/' . $branch;

cli/fix-drift.php

@@ -46,7 +46,7 @@
 foreach ($plugins as $versionnumber => $plugintypes) {
     $version = mlang_version::by_dir($versionnumber);
 
-    if ($version->branch == 'MOODLE_39_STABLE') {
+    if ($version->branch == 'MOODLE_40_STABLE') {
         $gitbranch = 'origin/master';
     } else {
         $gitbranch = 'origin/' . $version->branch;

cli/parse-core.php

@@ -278,6 +278,7 @@ function amos_parse_core_commit() {
     'MOODLE_37_STABLE',
     'MOODLE_38_STABLE',
     'MOODLE_39_STABLE',
+    'MOODLE_40_STABLE',
 );
 
 $standardplugins = local_amos_standard_plugins();
@@ -290,7 +291,7 @@ function amos_parse_core_commit() {
 foreach ($MLANG_PARSE_BRANCHES as $branch) {
     fputs(STDOUT, "=========================================\n");
     fputs(STDOUT, "BRANCH {$branch}\n");
-    if ($branch == 'MOODLE_39_STABLE') {
+    if ($branch == 'MOODLE_40_STABLE') {
         $gitbranch = 'origin/master';
     } else {
         $gitbranch = 'origin/' . $branch;

cli/utilslib.php

@@ -272,6 +272,7 @@ protected function get_versions() {
                 mlang_version::MOODLE_37,
                 mlang_version::MOODLE_38,
                 mlang_version::MOODLE_39,
+                mlang_version::MOODLE_40,
             );
             $versions = array();
             foreach ($codes as $code) {

jobs/install-packs-publish

@@ -12,7 +12,7 @@ REPO=${AMOSDATAROOT}/repos/moodle-install/
 
 cd $REPO
 git fetch upstream
-for BRANCH in master MOODLE_38_STABLE MOODLE_37_STABLE MOODLE_36_STABLE MOODLE_35_STABLE; do
+for BRANCH in master MOODLE_39_STABLE MOODLE_38_STABLE MOODLE_37_STABLE MOODLE_36_STABLE MOODLE_35_STABLE; do
 	git checkout $BRANCH
 	git merge upstream/$BRANCH
 done
@@ -45,7 +45,8 @@ function update_branch {
 	git push [email protected]:amosbot/moodle-install.git $2:$2
 }
 
-update_branch install_master master 3.9
+update_branch install_master master 4.0
+update_branch install_38_STABLE MOODLE_39_STABLE 3.9
 update_branch install_38_STABLE MOODLE_38_STABLE 3.8
 update_branch install_37_STABLE MOODLE_37_STABLE 3.7
 update_branch install_36_STABLE MOODLE_36_STABLE 3.6

jobs/zip-packs-snapshot

@@ -10,7 +10,7 @@ CLONESROOT=${AMOSDATAROOT}/repos/moodle-langpacks-clones
 
 rsync -a --exclude 'README*' --exclude '*.zip' --exclude '.git' $AMOSDATAROOT/temp/export-zip/ $CLONESROOT
 
-for VER in 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 2.8 2.9 3.0 3.1 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 ; do
+for VER in 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 2.8 2.9 3.0 3.1 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 4.0 ; do
     cd $CLONESROOT/$VER
     set +e
     git add .

mlanglib.php

@@ -1664,6 +1664,7 @@ class mlang_version {
     const MOODLE_37 = 3700;
     const MOODLE_38 = 3800;
     const MOODLE_39 = 3900;
+    const MOODLE_40 = 4000;
 
     /** @var int internal code of the version */
     public $code;
@@ -1765,12 +1766,21 @@ protected function __construct(array $info) {
     protected static function versions_info() {
         return array(
             array(
-                'code'          => self::MOODLE_39,
+                'code'          => self::MOODLE_40,
                 'label'         => 'DEV',
+                'branch'        => 'MOODLE_40_STABLE',
+                'dir'           => '4.0',
+                'translatable'  => true,
+                'current'       => false,
+                'supported'     => true,
+            ),
+            array(
+                'code'          => self::MOODLE_39,
+                'label'         => '3.9',
                 'branch'        => 'MOODLE_39_STABLE',
                 'dir'           => '3.9',
                 'translatable'  => true,
-                'current'       => false,
+                'current'       => true,
                 'supported'     => true,
             ),
             array(
@@ -1779,7 +1789,7 @@ protected static function versions_info() {
                 'branch'        => 'MOODLE_38_STABLE',
                 'dir'           => '3.8',
                 'translatable'  => true,
-                'current'       => true,
+                'current'       => false,
                 'supported'     => true,
             ),
             array(