Commit e0cbdf07 authored by Daniel Bissani Furlin's avatar Daniel Bissani Furlin
Browse files

Issue SCRUM#139: force zone America/Sao_Paulo when pt_BR

parent 66c08fdd
Pipeline #12582 passed with stages
in 26 minutes and 15 seconds
......@@ -10,9 +10,9 @@ ssh-add <(echo "$PRIV_KEY")
echo "Deploy job name: $CI_JOB_NAME"
if [ "$CI_JOB_NAME" = "deploy_for_testing" ]; then
if test ${CI_JOB_NAME} = "deploy_for_testing" || test ${CI_JOB_NAME} = "deploy_for_testingi386"; then
dput -u -f --config=dput.cf repo build/*.changes
elif [ "$CI_JOB_NAME" = "deploy_for_stable" ]; then
elif test ${CI_JOB_NAME} = "deploy_for_stable" || test ${CI_JOB_NAME} = "deploy_for_stablei386"; then
CHANGELOG="package/debian/changelog"
LINE=$(head -n 1 $CHANGELOG)
PACKAGE=$(echo $LINE | cut -d' ' -f1)
......
......@@ -62,7 +62,6 @@ testi386:
deploy_for_testingi386:
stage: deploy
image: i386/ubuntu:16.04
only:
- master
tags:
......@@ -74,7 +73,6 @@ deploy_for_testingi386:
deploy_for_stablei386:
stage: deploy
image: i386/ubuntu:16.04
when: manual
only:
- master
......
ubiquity (2.21.63.7) testing; urgency=medium
* Force timezone to America/Sao_Paulo when user chooses a pt_BR installation.
-- Daniel Bissani Furlin <dbf15@c3sl.ufpr.br> Mon, 25 Sep 2017 13:38:41 -0300
ubiquity (2.21.63.6) testing; urgency=medium
 
* Remove unused packages.
......
......@@ -471,6 +471,8 @@ class Page(plugin.Plugin):
choices_c = self.choices_untranslated(question)
if choices_c:
zone = choices_c[0]
if 'America/Rio_Branco' in zone:
zone = 'America/Sao_Paulo'
self.ui.set_timezone(zone)
if self.automatic_page:
......
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