Commit 4bdecf6c authored by sajolida's avatar sajolida
Browse files

Only display size in MiB everywhere (see #9374#change-48812)

Conflicts:
	wiki/src/install/debian.html
	wiki/src/install/linux.html
	wiki/src/install/win.html
	wiki/src/upgrade.html
parent 2df10af3
......@@ -93,7 +93,7 @@
<div id="download">
<a id="download-button" href="[[!inline pages="inc/stable_i386_iso_url" raw="yes"]]" class="btn btn-lg btn-primary clearfix">
<span id="download-button-label" class="pull-left">Download Tails [[!inline pages="inc/stable_i386_version" raw="yes"]] ISO image
<small id="download-button-size" >[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>
(<small id="download-button-size" >[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>)
</span>
<div id="download-button-state" class="pull-right">
<span id="download-button-state-retry" class="label label-warning">Retry</span>
......
......@@ -784,12 +784,9 @@ to be released in `inc/*`:
Update the size of the ISO image in `inc/*`:
MB=$(LC_NUMERIC=C ls -l --si $ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso | \
cut -f 5 -d ' ' | sed -r 's/(.+)([MG])/\1 \2B/' | tr -d '\n')
MiB=$(LC_NUMERIC=C ls -l -h $ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso | \
cut -f 5 -d ' ' | sed -r 's/(.+)([MG])/\1 \2iB/' | tr -d '\n')
echo "($MB/$MiB)" > "$RELEASE_CHECKOUT/wiki/src/inc/stable_i386_iso_size.html"
echo "$MiB" > "$RELEASE_CHECKOUT/wiki/src/inc/stable_i386_iso_size_mib.html"
LC_NUMERIC=C ls -l -h $ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso | \
cut -f 5 -d ' ' | sed -r 's/(.+)([MG])/\1 \2iB/' \
> "$RELEASE_CHECKOUT/wiki/src/inc/stable_i386_iso_size.html"
Generate the expected signature verification output:
......
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-09-24 12:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
msgid "MB"
msgstr ""
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-09-24 12:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
msgid "MiB"
msgstr ""
......@@ -32,7 +32,7 @@
<ul>
<li>1 USB stick <small>(at least 4 GB)</small></li>
<li>1 hour to download Tails <small>[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small></li>
<li>1 hour to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>)</li>
<li>½ hour to install</li>
</ul>
......
......@@ -14,7 +14,7 @@
<br />
<span class="windows linux mac-usb mac-dvd debian expert upgrade-tails">
<small>[[!inline pages="inc/stable_i386_iso_size_mib" raw="yes"]] to download</small><br />
<small>[[!inline pages="inc/stable_i386_iso_size" raw="yes"]] to download</small><br />
</span>
<span class="windows linux mac-usb mac-dvd"><small>1 hour to install</small></span>
......
......@@ -186,8 +186,8 @@ ul {
color: #646464;
}
.remove-first-space {
margin-left: -0.3em;
.remove-extra-space {
margin: 0 -0.3em;
}
......
......@@ -38,7 +38,7 @@
[[!inline pages="install/inc/router/why_two.inline" raw="yes"]]
"""]]
</li>
<li>1 hour to download Tails <small>[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small></li>
<li>1 hour to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>)</li>
<li>1 hour to install</li>
</ul>
......
......@@ -38,7 +38,7 @@
[[!inline pages="install/inc/router/why_two.inline" raw="yes"]]
"""]]
</li>
<li>1 hour to download Tails <small>[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small></li>
<li>1 hour to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>)</li>
<li>1 hour to install</li>
</ul>
......
......@@ -58,7 +58,7 @@ following them:</p>
[[!inline pages="install/inc/router/why_extra.inline" raw="yes"]]
"""]]
</li>
<li>1 hour to download Tails <small>[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small></li>
<li>1 hour to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>)</li>
<li>½ hour to upgrade</li>
</ul>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment