diff options
| -rw-r--r-- | servo/locale/sv_SE/LC_MESSAGES/django.po | 2 | ||||
| -rw-r--r-- | servo/migrations/0038_auto_20151013_2302.py | 19 | ||||
| -rw-r--r-- | servo/models/device.py | 12 | ||||
| -rw-r--r-- | servo/urls/default.py | 9 |
4 files changed, 32 insertions, 10 deletions
diff --git a/servo/locale/sv_SE/LC_MESSAGES/django.po b/servo/locale/sv_SE/LC_MESSAGES/django.po index a52314c..7ddc1b9 100644 --- a/servo/locale/sv_SE/LC_MESSAGES/django.po +++ b/servo/locale/sv_SE/LC_MESSAGES/django.po @@ -429,7 +429,7 @@ msgid "" "service.</a>" msgstr "" "Jag godkänner <a href=\"/checkin/terms/\" target=\"_blank" -"\">servicevillkoren</a>" +"\">servicevillkoren.</a>" #: forms/checkin.py:178 msgid "Notify by SMS" diff --git a/servo/migrations/0038_auto_20151013_2302.py b/servo/migrations/0038_auto_20151013_2302.py new file mode 100644 index 0000000..034d40e --- /dev/null +++ b/servo/migrations/0038_auto_20151013_2302.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('servo', '0037_purchaseorderitem_user_fullname'), + ] + + operations = [ + migrations.AlterField( + model_name='shipment', + name='carrier', + field=models.CharField(default=b'', max_length=18, verbose_name='Carrier', blank=True, choices=[(b'XAER', b'Aero 2000'), (b'XAIRBEC', b'Airborne'), (b'XAIRB', b'Airborne'), (b'XARM', b'Aramex'), (b'XOZP', b'Australia Post'), (b'XBAX', b'BAX GLOBAL PTE LTD'), (b'XCPW', b'CPW Internal'), (b'XCL', b'Citylink'), (b'XDHL', b'DHL'), (b'XDHLC', b'DHL'), (b'XDZNA', b'Danzas-AEI'), (b'XEAS', b'EAS'), (b'XEGL', b'Eagle ASIA PACIFIC HOLDINGS'), (b'XEXXN', b'Exel'), (b'XFEDE', b'FedEx'), (b'XFDE', b'FedEx Air'), (b'XGLS', b'GLS-General Logistics Systems'), (b'XHNF', b'H and Friends'), (b'XNGLN', b'Nightline'), (b'XPL', b'Parceline'), (b'XPRLA', b'Purolator'), (b'SDS', b'SDS An Post'), (b'XSNO', b'Seino Transportation Co. Ltd.'), (b'XSTE', b'Star Track Express'), (b'XTNT', b'TNT'), (b'XUPSN', b'UPS'), (b'XUTI', b'UTi (Japan) K.K.'), (b'XYMT', b'YAMATO')]), + ), + ] diff --git a/servo/models/device.py b/servo/models/device.py index cf3b861..af7ce83 100644 --- a/servo/models/device.py +++ b/servo/models/device.py @@ -40,7 +40,7 @@ class Device(models.Model): description = models.CharField( max_length=128, default=_("New Device"), - verbose_name=_("description") + verbose_name=_("Description") ) brand = models.CharField( blank=True, @@ -99,7 +99,7 @@ class Device(models.Model): blank=True, default='', max_length=256, - verbose_name=_("configuration") + verbose_name=_("Configuration") ) WARRANTY_CHOICES = ( @@ -124,13 +124,13 @@ class Device(models.Model): blank=True, default='', max_length=32, - verbose_name=_("username") + verbose_name=_("Username") ) password = models.CharField( blank=True, default='', max_length=32, - verbose_name=_("password") + verbose_name=_("Password") ) purchased_on = models.DateField( null=True, @@ -164,7 +164,7 @@ class Device(models.Model): null=True, blank=True, upload_to="devices", - verbose_name=_("photo") + verbose_name=_("Photo") ) image_url = models.URLField( @@ -185,7 +185,7 @@ class Device(models.Model): is_vintage = models.BooleanField( default=False, - verbose_name='vintage', + verbose_name=_('Vintage'), help_text=_('Device is considered vintage in GSX') ) fmip_active = models.BooleanField(default=False, editable=False) diff --git a/servo/urls/default.py b/servo/urls/default.py index 7a25237..5000e73 100644 --- a/servo/urls/default.py +++ b/servo/urls/default.py @@ -22,7 +22,8 @@ urlpatterns = patterns( url(r'^queues/(\d+)/statuses/$', 'servo.views.queue.statuses'), - url(r'^barcode/([\w\-]+)/$', 'servo.views.note.show_barcode', name='barcodes-view'), + url(r'^barcode/([\w\-]+)/$', 'servo.views.note.show_barcode', + name='barcodes-view'), url(r'^files/(?P<pk>\d+)/view/$', files.view_file), url(r'^files/(?P<path>.+)/$', files.get_file), @@ -34,11 +35,13 @@ urlpatterns = patterns( url(r'^repairs/(\d+)/parts/(\d+)/return_label/$', gsx.return_label, name="parts-return_label"), - url(r'^repairs/([A-Z0-9]+)/details/$', gsx.repair_details, name="repairs-get_details"), + url(r'^repairs/([A-Z0-9]+)/details/$', gsx.repair_details, + name="repairs-get_details"), url(r'^returns/part/(?P<part_id>\d+)/register_return/$', gsx.register_return, name='parts-register_return'), - url(r'^events/(\d+)/ack/', 'servo.views.events.acknowledge', name="events-ack_event"), + url(r'^events/(\d+)/ack/', 'servo.views.events.acknowledge', + name="events-ack_event"), url(r'^tags/(\d+)/clear/', 'servo.views.tags.clear', name="tags-clear"), (r'^api/', include('servo.urls.api')), |