diff --git a/mahara-langpacks/langpacks.pl b/mahara-langpacks/langpacks.pl index 1efa17bbd6eeb8fd429d3f890e2543d80f91d0cf..09679f79ece69c2b32e25f6e44f8a3fd2c301687 100644 --- a/mahara-langpacks/langpacks.pl +++ b/mahara-langpacks/langpacks.pl @@ -111,7 +111,7 @@ system "git fetch --quiet origin"; # For launchpad, all languages are in a single branch, so update the lot system "bzr launchpad-login dev-mahara"; ! -d $BZRDIR && system "bzr init-repo $BZRDIR"; -my @branches = qw(1.7_STABLE 1.8_STABLE 1.9_STABLE 1.10_STABLE 15.04_STABLE master); +my @branches = qw(1.7_STABLE 1.8_STABLE 1.9_STABLE 1.10_STABLE 15.04_STABLE 15.10_STABLE master); foreach my $branch (@branches) { if ( ! -d "$BZRDIR/$branch" ) { @@ -145,14 +145,14 @@ foreach my $lang (@langkeys) { if ( $remote =~ m/^lp:mahara-lang/ ) { $repotype = 'launchpad'; - @branches = qw(1.7_STABLE 1.8_STABLE 1.9_STABLE 1.10_STABLE 15.04_STABLE master); + @branches = qw(1.7_STABLE 1.8_STABLE 1.9_STABLE 1.10_STABLE 15.04_STABLE 15.10_STABLE master); } elsif ( $remote =~ m{^https://git\.mahara\.org|^https://gitlab\.com} ) { $repotype = 'git'; ! -d "$gitlangdir" && system "git clone --quiet $remote $gitlangdir"; chdir $gitlangdir; system "git fetch --quiet"; - my $remotebranchcmd = 'git branch -r | grep -v "HEAD" | grep "origin\/\(master\|1.7_STABLE\|1.8_STABLE\|1.9_STABLE\|1.10_STABLE|15.04_STABLE\)$"'; + my $remotebranchcmd = 'git branch -r | grep -v "HEAD" | grep "origin\/\(master\|1.7_STABLE\|1.8_STABLE\|1.9_STABLE\|1.10_STABLE|15.04_STABLE|15.10_STABLE\)$"'; my $remotebranches = `$remotebranchcmd`; $remotebranches =~ s/\s+/ /; @branches = (); diff --git a/mahara-langpacks/update-pot.sh b/mahara-langpacks/update-pot.sh index 51098d781d04545ca4474d7ffc0138381ae209cb..2befcdcd7b5a631dbe18e2c1e98cb7ab173b401b 100755 --- a/mahara-langpacks/update-pot.sh +++ b/mahara-langpacks/update-pot.sh @@ -49,7 +49,7 @@ BZR=${WORK}/mahara-lang-bzr cd ${GITDIR} git fetch --quiet origin -branches="1.7_STABLE 1.8_STABLE 1.9_STABLE 1.10_STABLE 15.04_STABLE master" +branches="1.7_STABLE 1.8_STABLE 1.9_STABLE 1.10_STABLE 15.04_STABLE 15.10_STABLE master" for branch in ${branches} ; do branchexists=`git branch | grep "${branch}$"`