summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-06-02 15:32:21 +0200
committeranonym <anonym@riseup.net>2016-06-02 15:32:21 +0200
commit9c0a111624bd7cecbbb94b7c376ac52a7b3afd43 (patch)
tree987a71f44c4d10088ee490e26686a789151e44f2
parent4618e2fb45802ac42c4a811aa92609876b310815 (diff)
parent44c78e787687308d152ef885de50fa33ab4db281 (diff)
Merge branch 'testing' into devel
-rwxr-xr-ximport-translations30
-rw-r--r--wiki/src/blueprint/monthly_meeting.mdwn3
-rw-r--r--wiki/src/contribute/how/mirror.mdwn4
-rw-r--r--wiki/src/contribute/release_process.mdwn33
4 files changed, 44 insertions, 26 deletions
diff --git a/import-translations b/import-translations
index a74ad8e..3e788d7 100755
--- a/import-translations
+++ b/import-translations
@@ -20,6 +20,9 @@ lang_is_excluded () {
echo -n "$EXCLUDE_LANGS" | grep -qs -w "$lang"
}
+# Defaults
+LANG_DOT_PO_LAYOUT=yes
+
# Detect which project is in current folder,
# and set parameters accordingly
if [ -f 'po/tails.pot' ]; then
@@ -32,6 +35,8 @@ elif [ -f 'po/tails-iuk.pot' ]; then
BRANCH='tails-iuk_completed'
AFTER_IMPORT='make -C po pot && make -C po update-po'
elif [ -f 'po/onioncircuits.pot' ]; then
+ LANG_DOT_PO_LAYOUT=no
+ POTFILE=onioncircuits.pot
BRANCH='tails-onioncircuits_completed'
AFTER_IMPORT='./setup.py build_i18n && ( cd po && for po in *.po ; do msgmerge --update "$po" onioncircuits.pot ; done )'
elif [ -f 'po/tails-perl5lib.pot' ]; then
@@ -65,14 +70,25 @@ eval "$GIT_IN_TOR_TRANSLATION_DIR reset --hard \"origin/$BRANCH\""
# For each completely translated language, merge it,
# unless it is translated outside Transifex
-find "$TOR_TRANSLATION_DIR" -name '*.po' | while read po_file; do
- lang=$(basename "$po_file" | tr - _ | sed 's/\.po$//')
+if [ "$LANG_DOT_PO_LAYOUT" = yes ] ; then
+ find "$TOR_TRANSLATION_DIR" -name '*.po' | while read po_file; do
+ lang=$(basename "$po_file" | tr - _ | sed 's/\.po$//')
+
+ if ! lang_is_excluded "$lang"; then
+ echo "Importing translation for $lang..."
+ cp "$po_file" "$TAILS_PO_DIR"
+ fi
+ done
+else
+ find "$TOR_TRANSLATION_DIR" -name '*.pot' | while read po_file; do
+ lang=$(basename $(dirname "$po_file" | tr - _ | sed 's/\.pot$//'))
- if ! lang_is_excluded "$lang"; then
- echo "Importing translation for $lang..."
- cp "$po_file" "$TAILS_PO_DIR"
- fi
-done
+ if ! lang_is_excluded "$lang"; then
+ echo "Importing translation for $lang..."
+ cp "$po_file" "$TAILS_PO_DIR/${lang}.po"
+ fi
+ done
+fi
# Update PO files
if [ -n "${AFTER_IMPORT:-}" ]; then
diff --git a/wiki/src/blueprint/monthly_meeting.mdwn b/wiki/src/blueprint/monthly_meeting.mdwn
index 74b66f2..60c2e3f 100644
--- a/wiki/src/blueprint/monthly_meeting.mdwn
+++ b/wiki/src/blueprint/monthly_meeting.mdwn
@@ -16,6 +16,3 @@ Availability and plans for the next weeks
Discussions
===========
- - [[!tails_ticket 7626 desc="Investigate using Icedove as the RSS reader"]]
- - [[!tails_ticket 11052 desc="Do not suspend when closing lid
-"]]
diff --git a/wiki/src/contribute/how/mirror.mdwn b/wiki/src/contribute/how/mirror.mdwn
index a1b2c3f..d920fbf 100644
--- a/wiki/src/contribute/how/mirror.mdwn
+++ b/wiki/src/contribute/how/mirror.mdwn
@@ -242,11 +242,11 @@ download:
### 3. Schedule the pulling of the files
-Your mirror should sync every hour + 15 minutes (at 00:15, 01:15, 02:15, etc.).
+Your mirror should sync every hour + a random time (maximum 40 minutes).
Use `cron` or equivalent to schedule the same `rsync` command
as above.
- 15 * * * * root rsync -rt --delete rsync.torproject.org::amnesia-archive /var/www/YOUR_PATH/
+ 0 * * * * root sleep $(perl -E 'print int(rand(2400))') && rsync -rt --delete rsync.torproject.org::amnesia-archive /var/www/YOUR_PATH/
You can now [[ask for your mirror to be added to the pool|mirror#http-pool]].
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 2c52384..92ebf24 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -759,19 +759,6 @@ and on the live wiki (even for a release candidate):
git push origin master
)
-Wait for the HTTP mirrors to catch up
--------------------------------------
-
-Wait for the next rsync pull.
-
-Test downloading the ISO and IUK over HTTP.
-
-Make sure every webserver listed in the `dl.amnesia.boum.org` round
-robin pool has the new version. Drop those that are lagging behind and
-notify their administrators:
-
- ./check-mirrors.rb --allow-multiple --fast tails-i386-$VERSION
-
ISO history
-----------
@@ -908,12 +895,18 @@ Then, record the last commit before putting the release out for real:
Testing
=======
-1. Email <tails-testers@boum.org> to ask them to test the tentative ISO.
+1. Using `check-mirrors`, choose a fast mirror that already has the
+ tentative ISO. E.g. <https://mirrors.kernel.org/tails/> or
+ <https://mirrors.wikimedia.org/tails/> are reliable and have plenty
+ of bandwidth.
+1. Email <tails-testers@boum.org> to ask them to test the tentative
+ ISO, pointing them to the up-to-date mirror you've found previously.
1. Set up a Gobby document and copy the [[manual test
suite|contribute/release_process/test]] in it.
1. Email to <tails@boum.org> and potential contributors (see
`manual_testers.mdwn` in the internal Git repository) that tests
may start:
+ - point them to the up-to-date mirror you've found previously
- make it clear what's the deadline
- make it clear where and how you expect to get feedback
- attach the Torrent
@@ -931,6 +924,18 @@ Testing
Go wild!
========
+Wait for the HTTP mirrors to catch up
+-------------------------------------
+
+Test downloading the ISO and IUK over HTTP.
+
+Make sure every active mirror in the pool has the new version:
+
+ ./check-mirrors.rb --allow-multiple --fast tails-i386-$VERSION
+
+Ask <tails-mirrors@boum.org> to drop those that are lagging behind and
+notify their administrators.
+
Sanity check
------------