Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
PSzczepanski1996 committed Jan 12, 2024
2 parents f0417e0 + 3d9eeee commit e734ab4
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: ['3.9', '3.10', '3.11', '3.12']
python-version: ['3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v2
Expand All @@ -25,4 +25,4 @@ jobs:
pip install -r requirements_dev.txt
- name: Run Tests
run: |
python -m flake8 .
python -m flake8 .
8 changes: 2 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ Write your own config.json file:
}
```

Configuration of field "designation_id" is NOT required (it's for serving response from private messages).

You can also set "cmd_prefix" field for changing prefix for additional commands (by default '!').
You can also set "cmd_prefix" field for changing prefix for additional commands (by default '/').

## Polski

Expand All @@ -49,6 +47,4 @@ Stwórz plik config.json i zamieść następujący słownik:
}
```

Konfiguracja pola "designation_id" nie jest wymagana (służy tylko do obsługi prywatnych wiadomości).

Możesz także ustawić pole "cmd_prefix" dla zmiany prefixa dodatkowych komend (domyślnie '!').
Możesz także ustawić pole "cmd_prefix" dla zmiany prefixa dodatkowych komend (domyślnie '/').
4 changes: 2 additions & 2 deletions backend/storage/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@admin.action(description=_('Confirm selected designations'))
def generate_so_report_action(modeladmin, request, queryset):
def confirm_designations(modeladmin, request, queryset):
id_list = queryset.filter(approved=False).values_list('id', flat=True)
if id_list:
requests.post(
Expand All @@ -37,5 +37,5 @@ class DesignateAdmin(admin.ModelAdmin):
'message',
]
actions = [
generate_so_report_action,
confirm_designations,
]
2 changes: 1 addition & 1 deletion backend/storage/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Designate(models.Model):
objects = models.Manager()

def __str__(self): # noqa: D102
return f'Designate [{self.id}]'
return _('Designate [{0}]').format(self.id)

class Meta: # noqa: D106
verbose_name = _('Designation')
Expand Down

0 comments on commit e734ab4

Please sign in to comment.