Parcourir la source

i18n fixes (#3965)

* i18n fixes

Use i18n for search placeholder
Add i18n usage for Surcharge and Range abstract models where it was
missing

* Add trans to aria-label

* Add missing verbose names in migrations

---------

Co-authored-by: Viggodevries <viggo@highbiza.nl>
master
Alexey il y a 2 ans
Parent
révision
55b3773050
Aucun compte lié à l'adresse e-mail de l'auteur

+ 1
- 1
src/oscar/apps/offer/abstract_models.py Voir le fichier

837
     slug = fields.AutoSlugField(
837
     slug = fields.AutoSlugField(
838
         _("Slug"), max_length=128, unique=True, populate_from="name")
838
         _("Slug"), max_length=128, unique=True, populate_from="name")
839
 
839
 
840
-    description = models.TextField(blank=True)
840
+    description = models.TextField(_("Description"), blank=True)
841
 
841
 
842
     # Whether this range is public
842
     # Whether this range is public
843
     is_public = models.BooleanField(
843
     is_public = models.BooleanField(

+ 1
- 1
src/oscar/apps/offer/migrations/0001_initial.py Voir le fichier

82
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
82
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
83
                 ('name', models.CharField(unique=True, max_length=128, verbose_name='Name')),
83
                 ('name', models.CharField(unique=True, max_length=128, verbose_name='Name')),
84
                 ('slug', oscar.models.fields.autoslugfield.AutoSlugField(populate_from='name', unique=True, verbose_name='Slug', max_length=128, editable=False, blank=True)),
84
                 ('slug', oscar.models.fields.autoslugfield.AutoSlugField(populate_from='name', unique=True, verbose_name='Slug', max_length=128, editable=False, blank=True)),
85
-                ('description', models.TextField(blank=True)),
85
+                ('description', models.TextField(verbose_name="Description", blank=True)),
86
                 ('is_public', models.BooleanField(default=False, verbose_name='Is public?', help_text='Public ranges have a customer-facing page')),
86
                 ('is_public', models.BooleanField(default=False, verbose_name='Is public?', help_text='Public ranges have a customer-facing page')),
87
                 ('includes_all_products', models.BooleanField(default=False, verbose_name='Includes all products?')),
87
                 ('includes_all_products', models.BooleanField(default=False, verbose_name='Includes all products?')),
88
                 ('proxy_class', oscar.models.fields.NullCharField(unique=True, verbose_name='Custom class', default=None, max_length=255)),
88
                 ('proxy_class', oscar.models.fields.NullCharField(unique=True, verbose_name='Custom class', default=None, max_length=255)),

+ 2
- 0
src/oscar/apps/order/abstract_models.py Voir le fichier

1197
         abstract = True
1197
         abstract = True
1198
         app_label = 'order'
1198
         app_label = 'order'
1199
         ordering = ['pk']
1199
         ordering = ['pk']
1200
+        verbose_name = _("Surcharge")
1201
+        verbose_name_plural = _("Surcharges")

+ 3
- 1
src/oscar/apps/order/migrations/0009_surcharge.py Voir le fichier

27
             ],
27
             ],
28
             options={
28
             options={
29
                 'abstract': False,
29
                 'abstract': False,
30
-                'ordering': ['pk']
30
+                'ordering': ['pk'],
31
+                'verbose_name': 'Surcharge',
32
+                'verbose_name_plural': 'Surcharges'
31
             },
33
             },
32
         ),
34
         ),
33
     ]
35
     ]

+ 1
- 1
src/oscar/templates/oscar/partials/search.html Voir le fichier

1
 {% load i18n %}
1
 {% load i18n %}
2
 
2
 
3
 <form class="form-inline my-2 my-lg-0" method="GET" action="{% url 'search:search' %}">
3
 <form class="form-inline my-2 my-lg-0" method="GET" action="{% url 'search:search' %}">
4
-    <input class="form-control mr-sm-2" name="q" placeholder="Search" aria-label="Search">
4
+    <input class="form-control mr-sm-2" name="q" placeholder="{% trans 'Search' %}" aria-label="{% trans 'Search' %}">
5
     <button class="btn btn btn-secondary my-2 my-sm-0" type="submit">{% trans "Search" %}</button>
5
     <button class="btn btn btn-secondary my-2 my-sm-0" type="submit">{% trans "Search" %}</button>
6
 </form>
6
 </form>

Chargement…
Annuler
Enregistrer