Merge branch 'issue-245' into 'master'

Use gettext in LeaseForm Closes #245

Merge branch 'issue-245' into 'master'
Use gettext in LeaseForm Closes #245
156473d4 · Kálmán Viktor · 4263acfd · 16af9f8e · 156473d4
Commit 156473d4 authored Aug 19, 2014 by Kálmán Viktor
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 11 deletions

circle/dashboard/forms.py
+3 -11

No files found.
--- a/circle/dashboard/forms.py
+++ b/circle/dashboard/forms.py
@@ -634,12 +634,8 @@ class LeaseForm(forms.ModelForm):
            Field('name'),
            Field("suspend_interval_seconds", type="hidden", value="0"),
            Field("delete_interval_seconds", type="hidden", value="0"),
+            HTML(string_concat("<label>", _("Suspend in"), "</label>")),
            Div(
-                Div(
-                    HTML(_("Suspend in")),
-                    css_class="input-group-addon",
-                    style="width: 100px;",
-                ),
                NumberField("suspend_hours", css_class="form-control"),
                Div(
                    HTML(_("hours")),
@@ -662,12 +658,8 @@ class LeaseForm(forms.ModelForm):
                ),
                css_class="input-group interval-input",
            ),
+            HTML(string_concat("<label>", _("Delete in"), "</label>")),
            Div(
-                Div(
-                    HTML(_("Delete in")),
-                    css_class="input-group-addon",
-                    style="width: 100px;",
-                ),
                NumberField("delete_hours", css_class="form-control"),
                Div(
                    HTML(_("hours")),
@@ -691,7 +683,7 @@ class LeaseForm(forms.ModelForm):
                css_class="input-group interval-input",
            )
        )
-        helper.add_input(Submit("submit", "Save changes"))
+        helper.add_input(Submit("submit", _("Save changes")))
        return helper
    class Meta: