diff --git a/mahara-langpacks/langpacks.pl b/mahara-langpacks/langpacks.pl index 8ace4639867bf06567d74f7028968b9382c3df38..747c030dcb5f346469850e1ebc467c3f893b8ae1 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 master); +my @branches = qw(1.3_STABLE 1.4_STABLE 1.5_STABLE 1.6_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 master); + @branches = qw(1.3_STABLE 1.4_STABLE 1.5_STABLE 1.6_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\)$"'; + my $remotebranchcmd = 'git branch -r | grep -v "HEAD" | grep "origin\/\(master\|1.3_STABLE\|1.4_STABLE\|1.5_STABLE|1.6_STABLE\)$"'; my $remotebranches = `$remotebranchcmd`; $remotebranches =~ s/\s+/ /; @branches = (); diff --git a/mahara-langpacks/update-pot.sh b/mahara-langpacks/update-pot.sh index d361c3f8c091df0d6b9f4e3279fbe58aba11064f..8e6bd5586a2948d57698a4177c3edb49595f45eb 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 master" +branches="1.3_STABLE 1.4_STABLE 1.5_STABLE 1.6_STABLE master" for branch in ${branches} ; do branchexists=`git branch | grep "${branch}$"` @@ -179,4 +179,4 @@ for branch in ${branches} ; do echo "${remotecommit}" > ${last} fi -done \ No newline at end of file +done