From 80afa2afb9907f936b61f6b743a29b85e4c99f56 Mon Sep 17 00:00:00 2001
From: Daniel Levy <daniell@aptivate.org>
Date: Wed, 8 Jan 2020 16:47:26 +0000
Subject: [PATCH] Change string styling
---
internewshid/chn_spreadsheet/importer.py | 14 +++++++-------
internewshid/dashboard/models.py | 2 +-
internewshid/data_layer/models.py | 5 +++--
internewshid/hid/assets.py | 2 +-
internewshid/hid/filters.py | 6 +++---
internewshid/hid/tabs/view_and_edit_table.py | 14 +++++++-------
.../templates/hid/tabs/view_and_edit_buttons.html | 6 ++++--
internewshid/hid/views/item.py | 14 +++++++-------
internewshid/hid/views/upload_spreadsheet.py | 8 ++++----
internewshid/rest_api/views.py | 2 +-
internewshid/tabbed_page/filter_pool.py | 2 +-
internewshid/tabbed_page/tab_pool.py | 2 +-
.../tabbed_page/templatetags/render_tab.py | 2 +-
internewshid/taxonomies/models.py | 2 +-
internewshid/users/forms.py | 4 ++--
15 files changed, 44 insertions(+), 41 deletions(-)
diff --git a/internewshid/chn_spreadsheet/importer.py b/internewshid/chn_spreadsheet/importer.py
index e0e244cf..9ab9bd49 100644
--- a/internewshid/chn_spreadsheet/importer.py
+++ b/internewshid/chn_spreadsheet/importer.py
@@ -29,7 +29,7 @@ class Importer(object):
try:
sheet_profile = SheetProfile.objects.get(label=label)
except SheetProfile.DoesNotExist:
- error_msg = _('Misconfigured service. Source "{}" does not exist').format(label)
+ error_msg = _('Misconfigured service. Source "{0}" does not exist').format(label)
raise SheetImportException(error_msg)
return sheet_profile.profile
@@ -50,7 +50,7 @@ class Importer(object):
raise SheetImportException(error_msg)
rows = ws.rows
else:
- error_msg = _('Unsupported file format: {}').format(file_format)
+ error_msg = _('Unsupported file format: {0}').format(file_format)
raise SheetImportException(error_msg)
return rows
@@ -68,7 +68,7 @@ class Importer(object):
stripped_label = label.strip()
columns.append(col_map[stripped_label])
except Exception:
- error_msg = _('Unknown column: {}').format(label)
+ error_msg = _('Unknown column: {0}').format(label)
raise SheetImportException(error_msg)
else:
columns = [d.copy() for d in profile_columns]
@@ -108,7 +108,7 @@ class Importer(object):
objects.append(item)
except SheetImportException as e:
- raise type(e), type(e)(str(e) + 'in row {} '.format(i)), sys.exc_info()[2]
+ raise type(e), type(e)(str(e) + 'in row {0} '.format(i)), sys.exc_info()[2]
return objects
@@ -223,11 +223,11 @@ class CellConverter(object):
}
if self.type not in converters:
raise SheetImportException(
- _(u"Unknown data type '{}' ").format(self.type))
+ _(u"Unknown data type '{0}' ").format(self.type))
try:
return converters[self.type](self.value)
except Exception as e:
- message = _("{}: Can not process value '{}' of type '{}' ").format(str(e), self.value, self.type)
+ message = _("{0}: Can not process value '{1}' of type '{2}' ").format(str(e), self.value, self.type)
raise SheetImportException(message), None, sys.exc_info()[2]
def convert_date(self):
@@ -247,7 +247,7 @@ class CellConverter(object):
def parse_date(self):
if self.date_format is None:
raise SheetImportException(
- _(u"Date format not specified for '{}' ").format(self.field))
+ _(u"Date format not specified for '{0}' ").format(self.field))
try:
date_time = datetime.datetime.strptime(self.value,
diff --git a/internewshid/dashboard/models.py b/internewshid/dashboard/models.py
index f3652f43..a93a647d 100644
--- a/internewshid/dashboard/models.py
+++ b/internewshid/dashboard/models.py
@@ -57,4 +57,4 @@ class WidgetInstance(models.Model):
settings = JSONField(blank=True)
def __unicode__(self):
- return _("Instance of {}").format(self.widget_type)
+ return _("Instance of {0}").format(self.widget_type)
diff --git a/internewshid/data_layer/models.py b/internewshid/data_layer/models.py
index 57249598..aedf81c7 100644
--- a/internewshid/data_layer/models.py
+++ b/internewshid/data_layer/models.py
@@ -27,6 +27,7 @@ class DataLayerModel(models.Model):
class Message(DataLayerModel):
+
class Meta:
permissions = (
('can_change_message_body', 'Can change feedback'),
@@ -73,7 +74,7 @@ class Message(DataLayerModel):
if not taxonomy.is_multiple:
if len(terms) > 1:
- message = _("Taxonomy '{}' does not support multiple terms").format(taxonomy)
+ message = _("Taxonomy '{0}' does not support multiple terms").format(taxonomy)
raise TermException(message)
self.delete_all_terms(taxonomy)
@@ -85,7 +86,7 @@ class Message(DataLayerModel):
self.terms.remove(term)
def __unicode__(self):
- return u"{}: '{}' @{}".format(
+ return u"{0}: '{1}' @{2}".format(
self.id,
self.body,
self.timestamp
diff --git a/internewshid/hid/assets.py b/internewshid/hid/assets.py
index 417effbd..247e41bc 100644
--- a/internewshid/hid/assets.py
+++ b/internewshid/hid/assets.py
@@ -58,7 +58,7 @@ def require_assets(*assets):
global _assets
for asset in assets:
if asset not in _assets:
- raise AssetMissing("Missing asset: {}".format(asset))
+ raise AssetMissing("Missing asset: {0}".format(asset))
@contextmanager
diff --git a/internewshid/hid/filters.py b/internewshid/hid/filters.py
index e5b4e751..3335b270 100644
--- a/internewshid/hid/filters.py
+++ b/internewshid/hid/filters.py
@@ -5,7 +5,7 @@ class CategoryFilter(object):
if category and categories:
filters.setdefault('terms', []).append(
- '{}:{}'.format(categories[0], category)
+ '{0}:{1}'.format(categories[0], category)
)
@@ -14,7 +14,7 @@ class TagsFilter(object):
tags = query_dict.get('tags', None)
if tags is not None:
filters.setdefault('terms', []).append(
- 'tags:{}'.format(tags)
+ 'tags:{0}'.format(tags)
)
@@ -95,7 +95,7 @@ class FeedbackTypeFilter(object):
if feedback_type:
filters.setdefault('terms', []).append(
- 'item-types:{}'.format(feedback_type)
+ 'item-types:{0}'.format(feedback_type)
)
diff --git a/internewshid/hid/tabs/view_and_edit_table.py b/internewshid/hid/tabs/view_and_edit_table.py
index ae5607eb..53d62581 100644
--- a/internewshid/hid/tabs/view_and_edit_table.py
+++ b/internewshid/hid/tabs/view_and_edit_table.py
@@ -390,7 +390,7 @@ def _handle_batch_action(request, batch_action, selected):
'')
return
- messages.error(request, _("Unknown batch action '{}'").format(batch_action))
+ messages.error(request, _("Unknown batch action '{0}'").format(batch_action))
def _categorize_items(request, items, category):
@@ -450,8 +450,8 @@ def _delete_items(request, deleted):
try:
transport_items.bulk_delete(deleted)
num_deleted = len(deleted)
- msg = ungettext("{} item deleted.",
- "{} items deleted.",
+ msg = ungettext("{0} item deleted.",
+ "{0} items deleted.",
num_deleted).format(num_deleted)
messages.success(request, msg)
except Exception:
@@ -484,12 +484,12 @@ def _add_items_categories(request, items):
except TransportException:
failed += 1
if success > 0:
- msg = ungettext("Updated {} item.",
- "Updated {} items.",
+ msg = ungettext("Updated {0} item.",
+ "Updated {0} items.",
len(items)).format(len(items))
messages.success(request, msg)
if failed > 0:
- msg = ungettext("Failed to update {} item.",
- "Failed to update {} items.",
+ msg = ungettext("Failed to update {0} item.",
+ "Failed to update {0} items.",
len(items)).format(len(items))
messages.success(request, msg)
diff --git a/internewshid/hid/templates/hid/tabs/view_and_edit_buttons.html b/internewshid/hid/templates/hid/tabs/view_and_edit_buttons.html
index eb4d751a..039cb6f7 100644
--- a/internewshid/hid/templates/hid/tabs/view_and_edit_buttons.html
+++ b/internewshid/hid/templates/hid/tabs/view_and_edit_buttons.html
@@ -12,10 +12,12 @@
</optgroup>
{% endfor %}
</select>
- {% blocktrans %}{% bootstrap_button "Apply action" button_type="submit" name="action" value="batchupdate-"|add:button_placement button_class="btn btn-default btn-sm table-submit" %}{% endblocktrans %}
+ {% trans "Apply action" as apply_action %}
+ {% bootstrap_button apply_action button_type="submit" name="action" value="batchupdate-"|add:button_placement button_class="btn btn-default btn-sm table-submit" %}{% endblocktrans %}
{% if category_options %}
<div class="pull-right">
- {% blocktrans %}{% bootstrap_button "Save changes" button_type="submit" name="action" value="save-"|add:button_placement button_class="btn btn-success btn-sm table-submit" %}{% endblocktrans %}
+ {% trans "Save changes" as save_changes %}
+ {% bootstrap_button save_changes button_type="submit" name="action" value="save-"|add:button_placement button_class="btn btn-success btn-sm table-submit" %}
</div>
{% endif %}
</div>
diff --git a/internewshid/hid/views/item.py b/internewshid/hid/views/item.py
index 56a1325c..824c2c65 100644
--- a/internewshid/hid/views/item.py
+++ b/internewshid/hid/views/item.py
@@ -92,14 +92,14 @@ class AddEditItemView(FormView):
return self._response(
self.request.GET.get('next', '/'),
messages.ERROR,
- (_('Item with id {} could not be found').format(
+ (_('Item with id {0} could not be found').format(
str(kwargs.get('item_id'))))
)
except ItemTypeNotFound:
return self._response(
self.request.GET.get('next', '/'),
messages.ERROR,
- (_('Item type {} could not be found').format(
+ (_('Item type {0} could not be found').format(
str(kwargs.get('item_type'))))
)
return super(AddEditItemView, self).get(request, *args, **kwargs)
@@ -122,14 +122,14 @@ class AddEditItemView(FormView):
return self._response(
self.request.GET.get('next', '/'),
messages.ERROR,
- (_('Item with id {} could not be found').format(
+ (_('Item with id {0} could not be found').format(
str(kwargs.get('item_id'))))
)
except ItemTypeNotFound:
return self._response(
self.request.GET.get('next', '/'),
messages.ERROR,
- (_('Item type {} could not be found').format(
+ (_('Item type {0} could not be found').format(
str(kwargs.get('item_type'))))
)
@@ -243,7 +243,7 @@ class AddEditItemView(FormView):
if item_id == 0:
self.item = self._create_item(form, taxonomy)
item_description = self._get_item_description()
- message = _("%s %d successfully created.") % (
+ message = _("{0} {1} successfully created.").format(
item_description,
self.item['id']
)
@@ -251,7 +251,7 @@ class AddEditItemView(FormView):
else:
self._update_item(item_id, form)
item_description = self._get_item_description()
- message = _("%s %d successfully updated.") % (
+ message = _("{0} {1} successfully updated.").format(
item_description,
item_id,
)
@@ -405,7 +405,7 @@ class AddEditItemView(FormView):
return self._response(
self._get_next_url_for_delete(),
messages.SUCCESS,
- _("{} {} successfully deleted.").format(
+ _("{0} {1} successfully deleted.").format(
item_description,
id,
)
diff --git a/internewshid/hid/views/upload_spreadsheet.py b/internewshid/hid/views/upload_spreadsheet.py
index 0d787c44..37614af4 100644
--- a/internewshid/hid/views/upload_spreadsheet.py
+++ b/internewshid/hid/views/upload_spreadsheet.py
@@ -27,15 +27,15 @@ class UploadSpreadsheetView(FormView):
)
all_messages = [
gettext("Upload successful!"),
- ungettext("{} entry has been added.",
- "{} entries have been added.",
+ ungettext("{0} entry has been added.",
+ "{0} entries have been added.",
saved).format(saved)
]
if skipped > 0:
all_messages.append(
- ungettext("{} duplicate entry was skipped.",
- "{} duplicate entries were skipped.",
+ ungettext("{0} duplicate entry was skipped.",
+ "{0} duplicate entries were skipped.",
skipped).format(skipped)
)
diff --git a/internewshid/rest_api/views.py b/internewshid/rest_api/views.py
index 31e75a57..c6340d63 100644
--- a/internewshid/rest_api/views.py
+++ b/internewshid/rest_api/views.py
@@ -203,7 +203,7 @@ class TaxonomyViewSet(viewsets.ModelViewSet):
try:
taxonomy = Taxonomy.objects.get(slug=slug)
except Taxonomy.DoesNotExist:
- message = _("Taxonomy with slug '{}' does not exist.").format(slug)
+ message = _("Taxonomy with slug '{0}' does not exist.").format(slug)
data = {'detail': message}
return Response(data, status=status.HTTP_400_BAD_REQUEST)
diff --git a/internewshid/tabbed_page/filter_pool.py b/internewshid/tabbed_page/filter_pool.py
index e1d2ea5c..9b90c7fe 100644
--- a/internewshid/tabbed_page/filter_pool.py
+++ b/internewshid/tabbed_page/filter_pool.py
@@ -18,7 +18,7 @@ def get_filter(name):
try:
return _pool[name]
except KeyError:
- message = _("Filter named '{}' has not been registered").format(name)
+ message = _("Filter named '{0}' has not been registered").format(name)
raise MissingFilterError(message)
diff --git a/internewshid/tabbed_page/tab_pool.py b/internewshid/tabbed_page/tab_pool.py
index ce6f98cd..f15fa9b5 100644
--- a/internewshid/tabbed_page/tab_pool.py
+++ b/internewshid/tabbed_page/tab_pool.py
@@ -19,7 +19,7 @@ def get_tab(name):
return _pool[name]
except KeyError:
raise MissingTabError(
- _("Tab named '{}' has not been registered").format(name)
+ _("Tab named '{0}' has not been registered").format(name)
)
diff --git a/internewshid/tabbed_page/templatetags/render_tab.py b/internewshid/tabbed_page/templatetags/render_tab.py
index d10746e3..f56c7392 100644
--- a/internewshid/tabbed_page/templatetags/render_tab.py
+++ b/internewshid/tabbed_page/templatetags/render_tab.py
@@ -27,7 +27,7 @@ def _get_rendering_details(context, tab_instance):
try:
template_name = tab.template_name
except AttributeError:
- return _get_error_details('Missing template for {}'.format(
+ return _get_error_details('Missing template for {0}'.format(
tab_instance.tab_type
))
diff --git a/internewshid/taxonomies/models.py b/internewshid/taxonomies/models.py
index 5d2e0f11..ae999fee 100644
--- a/internewshid/taxonomies/models.py
+++ b/internewshid/taxonomies/models.py
@@ -124,7 +124,7 @@ class Term(models.Model):
)
def __unicode__(self):
- return "{}:{}".format(
+ return "{0}:{1}".format(
self.taxonomy.name,
self.name
)
diff --git a/internewshid/users/forms.py b/internewshid/users/forms.py
index 2cec1892..a8368176 100644
--- a/internewshid/users/forms.py
+++ b/internewshid/users/forms.py
@@ -167,12 +167,12 @@ class ContactPasswordResetForm(PasswordResetForm):
business_email__iexact=email)
if not len(self.users_cache):
raise ValidationError(
- _("User with email '{}' not known").format(email)
+ _("User with email '{0}' not known").format(email)
)
if not any(user.is_active for user in self.users_cache):
# none of the filtered users are active
raise ValidationError(
- _("User with email '{}' not known".format(email))
+ _("User with email '{0}' not known".format(email))
)
return email
--
GitLab