diff --git a/mahara-langpacks/langpacks.pl b/mahara-langpacks/langpacks.pl index 01ae8acee329764026c7ff0b67fd64f7c166f24f..890c19f54acbf7e9d2fc9235a5f2033a3e9cbc06 100644 --- a/mahara-langpacks/langpacks.pl +++ b/mahara-langpacks/langpacks.pl @@ -126,7 +126,7 @@ system "git fetch --quiet origin"; system "bzr launchpad-login dev-mahara"; ! -d $BZRDIR && system "bzr init-repo $BZRDIR"; # @UPDATE when there is a new series -my @branches = qw(1.7_STABLE 1.8_STABLE 1.9_STABLE 1.10_STABLE 15.04_STABLE 15.10_STABLE 16.04_STABLE master); +my @branches = qw(1.10_STABLE 15.04_STABLE 15.10_STABLE 16.04_STABLE master); foreach my $branch (@branches) { if ( ! -d "$BZRDIR/$branch" ) { @@ -161,7 +161,7 @@ foreach my $lang (@langkeys) { if ( $remote =~ m/^lp:mahara-lang/ ) { $repotype = 'launchpad'; # @UPDATE when there is a new series - @branches = qw(1.7_STABLE 1.8_STABLE 1.9_STABLE 1.10_STABLE 15.04_STABLE 15.10_STABLE 16.04_STABLE master); + @branches = qw(1.10_STABLE 15.04_STABLE 15.10_STABLE 16.04_STABLE master); } elsif ( $remote =~ m{^https://git\.mahara\.org|^https://gitlab\.com} ) { $repotype = 'git'; @@ -169,7 +169,7 @@ foreach my $lang (@langkeys) { chdir $gitlangdir; system "git fetch --quiet"; # @UPDATE when there is a new series - 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|16.04_STABLE\)$"'; + my $remotebranchcmd = 'git branch -r | grep -v "HEAD" | grep "origin\/\(master\|1.10_STABLE|15.04_STABLE|15.10_STABLE|16.04_STABLE\)$"'; my $remotebranches = `$remotebranchcmd`; $remotebranches =~ s/\s+/ /; @branches = (); diff --git a/mahara-langpacks/update-pot.sh b/mahara-langpacks/update-pot.sh index d8804a8715a9b0074c2a90617c1014a152cfd1c5..fa891706045c67523373b555cc2da069187742eb 100755 --- a/mahara-langpacks/update-pot.sh +++ b/mahara-langpacks/update-pot.sh @@ -60,7 +60,7 @@ cd ${GITDIR} git fetch --quiet origin # @UPDATE when there is a new series -branches="1.7_STABLE 1.8_STABLE 1.9_STABLE 1.10_STABLE 15.04_STABLE 15.10_STABLE 16.04_STABLE master" +branches="1.10_STABLE 15.04_STABLE 15.10_STABLE 16.04_STABLE master" for branch in ${branches} ; do branchexists=`git branch | grep "${branch}$"`