diff --git a/mahara-langpacks/langpacks.pl b/mahara-langpacks/langpacks.pl index 68c85e653b83bf7a25a669e7bc272c63a530e483..a7104fe6fe8d8be09e24f01d1233268d715eec15 100644 --- a/mahara-langpacks/langpacks.pl +++ b/mahara-langpacks/langpacks.pl @@ -109,7 +109,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 master); +my @branches = qw(1.3_STABLE 1.4_STABLE 1.5_STABLE 1.6_STABLE 1.7_STABLE master); foreach my $branch (@branches) { if ( ! -d "$BZRDIR/$branch" ) { @@ -143,14 +143,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 master); + @branches = qw(1.3_STABLE 1.4_STABLE 1.5_STABLE 1.6_STABLE 1.7_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\)$"'; + 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 $remotebranches = `$remotebranchcmd`; $remotebranches =~ s/\s+/ /; @branches = (); diff --git a/mahara-langpacks/update-pot.sh b/mahara-langpacks/update-pot.sh index 7f6a641c7ab4545b56a128b1cc3e3b7027db87dc..8fa8af5ae42ee0be17697bc0e7b39977afc6af69 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 master" +branches="1.3_STABLE 1.4_STABLE 1.5_STABLE 1.6_STABLE 1.7_STABLE master" for branch in ${branches} ; do branchexists=`git branch | grep "${branch}$"`