Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/123175
Change subject: Disable support for branches in preparation of JSON format ...................................................................... Disable support for branches in preparation of JSON format May not return. Change-Id: I2bd12e66527f5b282ec956c1e076310e7b320df4 --- M REPOCONF M REPOCONF.siebrand M TranslateSettings.php M bin/repoexport M groups/check-blacklist.php 5 files changed, 1 insertion(+), 80 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/75/123175/1 diff --git a/REPOCONF b/REPOCONF index 696f68f..eb01761 100644 --- a/REPOCONF +++ b/REPOCONF @@ -2,7 +2,7 @@ #REPO_RW=yes REPO_MEDIAWIKI=https://gerrit.wikimedia.org/r/p//mediawiki/core.git -REPO_MEDIAWIKI_BRANCHES="master REL1_22 REL1_21 REL1_20" +REPO_MEDIAWIKI_BRANCHES="master" REPO_MWEXTGIT=https://gerrit.wikimedia.org/r/p/mediawiki/extensions REPO_BLOCKLY=http://blockly.googlecode.com/svn/trunk/ diff --git a/REPOCONF.siebrand b/REPOCONF.siebrand index 9266854..2e4d15e 100644 --- a/REPOCONF.siebrand +++ b/REPOCONF.siebrand @@ -2,7 +2,6 @@ REPO_RW=yes REPO_MEDIAWIKI=ssh://l10n-...@gerrit.wikimedia.org:29418/mediawiki/core.git -#REPO_MEDIAWIKI_BRANCHES="master REL1_22 REL1_21 REL1_20" REPO_MEDIAWIKI_BRANCHES="master" REPO_MWEXTGIT=ssh://l10n-...@gerrit.wikimedia.org:29418/mediawiki/extensions diff --git a/TranslateSettings.php b/TranslateSettings.php index 9da8582..4f63232 100644 --- a/TranslateSettings.php +++ b/TranslateSettings.php @@ -115,55 +115,6 @@ $mg->setListFile( "$GROUPS/MediaWiki/wikimedia-mostused-2011.txt" ); $cc[$id] = $mg; - $changed = array( - '1.22' => array( - 'specialpages-note', - ), // Checked up to 972865c51c9e54ac76f3941f6cfa59db5326c52e / 2013-11-21 - '1.21' => array( - 'passwordreset-emailerror-capture', 'wlheader-enotif', 'wlheader-showupdated', 'edithelppage', - 'createacct-imgcaptcha-help', 'createacct-benefit-body1', 'createacct-benefit-body2', 'createacct-benefit-body3', - 'login-throttled', 'right-editprotected', 'uploadnologintext', 'contribsub2', - 'autocomment-prefix', 'prefs-help-watchlist-token', 'right-editprotected', - // From 1.22 - 'specialpages-note', - ), // Checked up to 972865c51c9e54ac76f3941f6cfa59db5326c52e / 2013-11-21 - '1.20' => array( - 'cannotundelete', 'logouttext', 'enotif_body', 'createaccountmail', - 'username', 'uid', 'prefs-memberingroups', 'linksearch-text', - 'contributions', - 'logentry-delete-delete', 'logentry-delete-event', 'logentry-delete-event-legacy', 'logentry-delete-restore', - 'logentry-delete-revision', 'logentry-delete-revision-legacy', 'logentry-move-move', 'logentry-move-move-noredirect', - 'logentry-move-move_redir', 'logentry-move-move_redir-noredirect', 'logentry-newusers-autocreate', 'logentry-newusers-create', - 'logentry-newusers-create2', 'logentry-newusers-newusers', 'logentry-patrol-patrol', 'logentry-patrol-patrol-auto', - 'logentry-suppress-delete', 'logentry-suppress-event', 'logentry-suppress-event-legacy', 'logentry-suppress-revision', - 'logentry-suppress-revision-legacy', - // From 1.21 - 'passwordreset-emailerror-capture', 'wlheader-enotif', 'wlheader-showupdated', 'edithelppage', - 'createacct-imgcaptcha-help', 'createacct-benefit-body1', 'createacct-benefit-body2', 'createacct-benefit-body3', - 'login-throttled', 'right-editprotected', 'uploadnologintext', 'contribsub2', - 'autocomment-prefix', 'prefs-help-watchlist-token', 'right-editprotected', - // From 1.22 - 'specialpages-note', - ), // Checked up to 972865c51c9e54ac76f3941f6cfa59db5326c52e / 2013-11-21 - ); - - $branches = array_keys( $changed ); - - foreach ( $branches as $branch ) { - $id = "core-$branch"; - $mangle = new StringMatcher( "mw-core-$branch-", $changed[$branch] ); - $mg = CoreMessageGroup::factory( "MediaWiki $branch", $id ); - $mg->setDescription( "{{int:translate-group-desc-mediawiki-core-branch}}" ); - $mg->setMangler( $mangle ); - $releaseDir = 'REL' . str_replace( '.', '_', $branch ); - $mg->setPrefix( "$wgTranslateGroupRoot/mediawiki/$releaseDir/languages/messages" ); - $mg->setMetaDataPrefix( "$wgTranslateGroupRoot/mediawiki/$releaseDir/maintenance/language/" ); - $mg->setIcon( 'wiki://Mediawiki-logo.png' ); - $mg->setMeta( true ); - $mg->parentId = 'core'; - $cc[$id] = $mg; - } - return true; } diff --git a/bin/repoexport b/bin/repoexport index 4d24f75..5bb32d0 100755 --- a/bin/repoexport +++ b/bin/repoexport @@ -89,22 +89,6 @@ php "$EXPORTER" --target mediawiki/master/languages/messages --group 'core' --lang "$FORCELANGS" $HOURS & php "$EXPORTER" --target . --group 'ext-installer' --lang '*' --skip "$SKIPLANGS" $HOURS & - if [ -d "mediawiki/REL1_22/" ] - then - php "$EXPORTER" --target mediawiki/REL1_21/languages/messages --core-meta --group 'core-1.22' --lang '*' --skip="$SKIPLANGS" --threshold 15 & - fi - if [ -d "mediawiki/REL1_21/" ] - then - # Skips because plural rules are not backward compatible. - SKIPLOCAL="gv,ab,av,ba,bxr,ce,crh_cyrl,cv,inh,koi,krc,kv,lbe,lez,mhr,mrj,myv,ru,tt_cyrl,tyv,udm,xal" - php "$EXPORTER" --target mediawiki/REL1_21/languages/messages --core-meta --group 'core-1.21' --lang '*' --skip="$SKIPLOCAL,$SKIPLANGS" --threshold 15 & - fi - if [ -d "mediawiki/REL1_20/" ] - then - # Skips because plural rules are not backward compatible. - SKIPLOCAL="gd,gv,ab,av,ba,bxr,ce,crh_cyrl,cv,inh,koi,krc,kv,lbe,lez,mhr,mrj,myv,ru,tt_cyrl,tyv,udm,xal" - php "$EXPORTER" --target mediawiki/REL1_20/languages/messages --core-meta --group 'core-1.20' --lang '*' --skip="$SKIPLOCAL,$SKIPLANGS" --threshold 15 & - fi wait elif [ "$PROJECT" = "mediawiki-extensions" ] diff --git a/groups/check-blacklist.php b/groups/check-blacklist.php index 20237f9..4dec8dc 100644 --- a/groups/check-blacklist.php +++ b/groups/check-blacklist.php @@ -108,19 +108,6 @@ ), ), array( - 'group' => 'core-1.20', - 'check' => 'variable', - 'message' => array( - 'mw-core-1.20-logentry-newusers-create2', // Optional GENDER parameter - 'mw-core-1.20-logentry-move-move redir-noredirect', // Optional GENDER parameter - 'mw-core-1.20-logentry-move-move redir', // Optional GENDER parameter - 'mw-core-1.20-logentry-move-move-noredirect', // Optional GENDER parameter - 'mw-core-1.20-logentry-move-move', // Optional GENDER parameter - 'mw-core-1.20-logentry-delete-restore', // Optional GENDER parameter - 'mw-core-1.20-logentry-delete-delete', // Optional GENDER parameter - ), - ), - array( 'group' => 'core', 'check' => 'plural', 'message' => array( -- To view, visit https://gerrit.wikimedia.org/r/123175 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2bd12e66527f5b282ec956c1e076310e7b320df4 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand <siebr...@kitano.nl> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
