diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-06-02 23:31:23 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-06-02 23:31:23 -0300 |
| commit | 3b23b4424f2bc105cbe1b92394e3b925c53f9a61 (patch) | |
| tree | ca1d3fa84f071e0ff2187cc94dfbd4901005e72a | |
| parent | 009b3c0d97661e159cd0fe52be5407b72434ac70 (diff) | |
| parent | cc4fef23e2b4da4744224f5b2c0dbb679834aa49 (diff) | |
Merge branch 'master' of git://projects.archlinux.org/archweb
| -rw-r--r-- | devel/views.py | 4 | ||||
| -rw-r--r-- | releng/views.py | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/devel/views.py b/devel/views.py index c0d10285..89963d27 100644 --- a/devel/views.py +++ b/devel/views.py @@ -77,9 +77,7 @@ def clock(request): now = datetime.now() utc_now = datetime.utcnow().replace(tzinfo=pytz.utc) for dev in devs: - # Work around https://bugs.launchpad.net/pytz/+bug/718673 - timezone = str(dev.userprofile.time_zone) - tz = pytz.timezone(timezone) + tz = pytz.timezone(dev.userprofile.time_zone) dev.current_time = utc_now.astimezone(tz) page_dict = { diff --git a/releng/views.py b/releng/views.py index 3180a9ed..1d4a0b5e 100644 --- a/releng/views.py +++ b/releng/views.py @@ -24,12 +24,12 @@ class TestForm(forms.ModelForm): source = standard_field(Source) clock_choice = standard_field(ClockChoice) filesystem = standard_field(Filesystem, - help_text="verify /etc/fstab, `df -hT` output and commands like " \ - "lvdisplay for special modules") + help_text="Verify /etc/fstab, `df -hT` output and commands like " \ + "lvdisplay for special modules.") modules = forms.ModelMultipleChoiceField(queryset=Module.objects.all(), help_text="", widget=forms.CheckboxSelectMultiple(), required=False) bootloader = standard_field(Bootloader, - help_text="Verify that the entries in the bootloader config look ok") + help_text="Verify that the entries in the bootloader config looks OK.") rollback_filesystem = standard_field(Filesystem, help_text="If you did a rollback followed by a new attempt to setup " \ "your blockdevices/filesystems, select which option you took here.", @@ -38,9 +38,13 @@ class TestForm(forms.ModelForm): help_text="If you did a rollback followed by a new attempt to setup " \ "your blockdevices/filesystems, select which option you took here.", widget=forms.CheckboxSelectMultiple(), required=False) - success = forms.BooleanField(help_text="Only check this if everything went fine. " \ - "If you you ran into any errors please specify them in the " \ - "comments.", required=False) + success = forms.BooleanField( + help_text="Only check this if everything went fine. " \ + "If you ran into problems please create a ticket on <a " \ + "href=\"https://bugs.archlinux.org/index.php?project=6\">the " \ + "bugtracker</a> (or check that one already exists) and link to " \ + "it in the comments.", + required=False) website = forms.CharField(label='', widget=forms.TextInput(attrs={'style': 'display:none;'}), required=False) |