diff --git a/mahara-langpacks/langpacks.pl b/mahara-langpacks/langpacks.pl index 8ef135b2a31008e66b107470c79496e708cb2f53..7fd8f47f1340a03aa663ab5dc30ec9aeead6331e 100644 --- a/mahara-langpacks/langpacks.pl +++ b/mahara-langpacks/langpacks.pl @@ -110,7 +110,7 @@ system "git fetch --quiet origin"; # For launchpad, all languages are in a single branch, so update the lot ! -d $BZRDIR && system "bzr init-repo $BZRDIR"; -my @branches = qw(1.6_STABLE 1.7_STABLE 1.8_STABLE 1.9_STABLE 1.10_STABLE master); +my @branches = qw(1.7_STABLE 1.8_STABLE 1.9_STABLE 1.10_STABLE 15.04_STABLE master); foreach my $branch (@branches) { if ( ! -d "$BZRDIR/$branch" ) { @@ -144,14 +144,14 @@ foreach my $lang (@langkeys) { if ( $remote =~ m/^lp:mahara-lang/ ) { $repotype = 'launchpad'; - @branches = qw(1.6_STABLE 1.7_STABLE 1.8_STABLE 1.9_STABLE 1.10_STABLE master); + @branches = qw(1.7_STABLE 1.8_STABLE 1.9_STABLE 1.10_STABLE 15.04_STABLE master); } elsif ( $remote =~ m{^git://gitorious\.org} ) { $repotype = 'gitorious'; ! -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.6_STABLE\|1.7_STABLE\|1.8_STABLE\|1.9_STABLE\|1.10_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\)$"'; my $remotebranches = `$remotebranchcmd`; $remotebranches =~ s/\s+/ /; @branches = (); diff --git a/mahara-langpacks/update-pot.sh b/mahara-langpacks/update-pot.sh index 5f8739d926a194b0036e3b21165a53f68cb8a239..d15e20309197b1c957589a50bb7a850d9626decf 100755 --- a/mahara-langpacks/update-pot.sh +++ b/mahara-langpacks/update-pot.sh @@ -41,7 +41,7 @@ BZR=${WORK}/mahara-lang-bzr cd ${GITDIR} git fetch --quiet origin -branches="1.6_STABLE 1.7_STABLE 1.8_STABLE 1.9_STABLE 1.10_STABLE master" +branches="1.7_STABLE 1.8_STABLE 1.9_STABLE 1.10_STABLE 15.04_STABLE master" for branch in ${branches} ; do branchexists=`git branch | grep "${branch}$"`