From 64551cd5112633c2766603d10b664bdcdded03ff Mon Sep 17 00:00:00 2001 From: Aaron Wells Date: Thu, 24 Oct 2013 13:54:11 +1300 Subject: [PATCH] Adding 1.8_STABLE translations branch --- mahara-langpacks/langpacks.pl | 6 +++--- mahara-langpacks/update-pot.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mahara-langpacks/langpacks.pl b/mahara-langpacks/langpacks.pl index e37f05e..1dc57d1 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.3_STABLE 1.4_STABLE 1.5_STABLE 1.6_STABLE 1.7_STABLE master); +my @branches = qw(1.3_STABLE 1.4_STABLE 1.5_STABLE 1.6_STABLE 1.7_STABLE 1.8_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.3_STABLE 1.4_STABLE 1.5_STABLE 1.6_STABLE 1.7_STABLE master); + @branches = qw(1.3_STABLE 1.4_STABLE 1.5_STABLE 1.6_STABLE 1.7_STABLE 1.8_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.3_STABLE\|1.4_STABLE\|1.5_STABLE\|1.6_STABLE\|1.7_STABLE\)$"'; + my $remotebranchcmd = 'git branch -r | grep -v "HEAD" | grep "origin\/\(master\|1.3_STABLE\|1.4_STABLE\|1.5_STABLE\|1.6_STABLE\|1.7_STABLE\|1.8_STABLE\)$"'; my $remotebranches = `$remotebranchcmd`; $remotebranches =~ s/\s+/ /; @branches = (); diff --git a/mahara-langpacks/update-pot.sh b/mahara-langpacks/update-pot.sh index 8fa8af5..07090d3 100755 --- a/mahara-langpacks/update-pot.sh +++ b/mahara-langpacks/update-pot.sh @@ -40,7 +40,7 @@ BZR=${WORK}/mahara-lang-bzr cd ${GITDIR} git fetch --quiet origin -branches="1.3_STABLE 1.4_STABLE 1.5_STABLE 1.6_STABLE 1.7_STABLE master" +branches="1.3_STABLE 1.4_STABLE 1.5_STABLE 1.6_STABLE 1.7_STABLE 1.8_STABLE master" for branch in ${branches} ; do branchexists=`git branch | grep "${branch}$"` -- GitLab