-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Rafał Safin <[email protected]>
- Loading branch information
Rafał Safin
committed
Sep 10, 2024
1 parent
10fed82
commit 4f3ddab
Showing
14 changed files
with
159 additions
and
26 deletions.
There are no files selected for viewing
72 changes: 72 additions & 0 deletions
72
base/migrations/0087_alter_outline_initial_outline_buildings_and_more.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
# Generated by Django 5.1.1 on 2024-09-10 11:28 | ||
|
||
import django.contrib.postgres.fields | ||
from django.db import migrations, models | ||
|
||
import base.models.outline | ||
|
||
|
||
class Migration(migrations.Migration): | ||
dependencies = [ | ||
("base", "0086_alter_periodmodel_status"), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name="outline", | ||
name="initial_outline_buildings", | ||
field=django.contrib.postgres.fields.ArrayField( | ||
base_field=models.CharField( | ||
choices=[ | ||
("headquarters", "Headquarters"), | ||
("barracks", "Barracks"), | ||
("stable", "Stable"), | ||
("workshop", "Workshop"), | ||
("academy", "Academy"), | ||
("smithy", "Smithy"), | ||
("rally_point", "Rally point"), | ||
("statue", "Statue"), | ||
("market", "Market"), | ||
("timber_camp", "Timber camp"), | ||
("clay_pit", "Clay pit"), | ||
("iron_mine", "Iron mine"), | ||
("farm", "Farm"), | ||
("warehouse", "Warehouse"), | ||
("wall", "Wall"), | ||
("watchtower", "Watchtower"), | ||
], | ||
max_length=100, | ||
), | ||
default=base.models.outline.building_default_list, | ||
size=None, | ||
), | ||
), | ||
migrations.AlterField( | ||
model_name="weightmodel", | ||
name="building", | ||
field=models.CharField( | ||
blank=True, | ||
choices=[ | ||
("headquarters", "Headquarters"), | ||
("barracks", "Barracks"), | ||
("stable", "Stable"), | ||
("workshop", "Workshop"), | ||
("academy", "Academy"), | ||
("smithy", "Smithy"), | ||
("rally_point", "Rally point"), | ||
("statue", "Statue"), | ||
("market", "Market"), | ||
("timber_camp", "Timber camp"), | ||
("clay_pit", "Clay pit"), | ||
("iron_mine", "Iron mine"), | ||
("farm", "Farm"), | ||
("warehouse", "Warehouse"), | ||
("wall", "Wall"), | ||
("watchtower", "Watchtower"), | ||
], | ||
default=None, | ||
max_length=50, | ||
null=True, | ||
), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ msgid "" | |
msgstr "" | ||
"Project-Id-Version: PACKAGE VERSION\n" | ||
"Report-Msgid-Bugs-To: \n" | ||
"POT-Creation-Date: 2024-09-10 12:18+0200\n" | ||
"POT-Creation-Date: 2024-09-10 13:01+0200\n" | ||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | ||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
"Language-Team: LANGUAGE <[email protected]>\n" | ||
|
@@ -31,7 +31,7 @@ msgstr "Data" | |
msgid "World" | ||
msgstr "Świat" | ||
|
||
#: base/forms.py:51 base/models/outline.py:156 base/models/outline.py:323 | ||
#: base/forms.py:51 base/models/outline.py:157 base/models/outline.py:324 | ||
#: base/models/profile.py:35 | ||
msgid "Army collection" | ||
msgstr "Zbiórka Wojska" | ||
|
@@ -63,7 +63,7 @@ msgstr "" | |
msgid "Village in this line is duplicated: %s" | ||
msgstr "Wioska w tej linii jest podwojona: %s" | ||
|
||
#: base/forms.py:134 base/models/outline.py:157 base/models/outline.py:325 | ||
#: base/forms.py:134 base/models/outline.py:158 base/models/outline.py:326 | ||
#: base/models/profile.py:36 | ||
msgid "Deff collection " | ||
msgstr "Zbiórka Obrona" | ||
|
@@ -685,66 +685,71 @@ msgstr "Spichlerz" | |
|
||
#: base/models/outline.py:120 base/models/weight_model.py:45 | ||
#: base/templates/base/new_outline/new_outline_initial_period1.html:468 | ||
msgid "wall" | ||
msgid "Wall" | ||
msgstr "Mur" | ||
|
||
#: base/models/outline.py:124 | ||
#: base/models/outline.py:121 base/models/weight_model.py:46 | ||
#: base/templates/base/new_outline/new_outline_initial_period1.html:468 | ||
msgid "Watchtower" | ||
msgstr "Wieża Strażnicza" | ||
|
||
#: base/models/outline.py:125 | ||
msgid "Average greater than 8k" | ||
msgstr "Średnio powyżej 8k" | ||
|
||
#: base/models/outline.py:125 | ||
#: base/models/outline.py:126 | ||
msgid "Average 5-8k" | ||
msgstr "Średnio 5-8k" | ||
|
||
#: base/models/outline.py:138 | ||
#: base/models/outline.py:139 | ||
msgid "Fakes only from off villages" | ||
msgstr "Fejki tylko z wiosek z pełnym offem" | ||
|
||
#: base/models/outline.py:139 | ||
#: base/models/outline.py:140 | ||
msgid "Fakes from all villages" | ||
msgstr "Fejki z wszystkich wiosek" | ||
|
||
#: base/models/outline.py:145 | ||
#: base/models/outline.py:146 | ||
msgid "(Default) Auto generated, fully equipped safe links" | ||
msgstr "(Domyślne) Automatycznie wygenerowane bezpieczne linki" | ||
|
||
#: base/models/outline.py:147 | ||
#: base/models/outline.py:148 | ||
msgid "Text simple directly in message" | ||
msgstr "Tekst prosty bezpośrednio w wiadomości" | ||
|
||
#: base/models/outline.py:148 | ||
#: base/models/outline.py:149 | ||
msgid "New text extended directly in message" | ||
msgstr "Nowy tekst rozszerzony bezpośrednio w wiadomości" | ||
|
||
#: base/models/outline.py:149 | ||
#: base/models/outline.py:150 | ||
msgid "Old text extended directly in message" | ||
msgstr "Stary tekst rozszerzony bezpośrednio w wiadomości" | ||
|
||
#: base/models/outline.py:150 | ||
#: base/models/outline.py:151 | ||
msgid "Text for deputy directly in message" | ||
msgstr "Tekst dla zastępcy bezpośrednio w wiadomości" | ||
|
||
#: base/models/outline.py:300 base/models/profile.py:60 | ||
#: base/models/outline.py:301 base/models/profile.py:60 | ||
msgid "Outline Targets" | ||
msgstr "Cele Akcja" | ||
|
||
#: base/models/outline.py:328 | ||
#: base/models/outline.py:329 | ||
msgid "Name" | ||
msgstr "Nazwa" | ||
|
||
#: base/models/outline.py:428 | ||
#: base/models/outline.py:429 | ||
msgid "Expires " | ||
msgstr "Wygasa " | ||
|
||
#: base/models/outline.py:433 | ||
#: base/models/outline.py:434 | ||
msgid "never" | ||
msgstr "nigdy" | ||
|
||
#: base/models/outline.py:445 | ||
#: base/models/outline.py:446 | ||
msgid "in" | ||
msgstr "za" | ||
|
||
#: base/models/outline.py:447 | ||
#: base/models/outline.py:448 | ||
msgid "days" | ||
msgstr "dni" | ||
|
||
|
@@ -3141,6 +3146,9 @@ msgstr "Wioska" | |
msgid "does not exists" | ||
msgstr "nie istnieje" | ||
|
||
#~ msgid "wall" | ||
#~ msgstr "Mur" | ||
|
||
#~ msgid "All targets below" | ||
#~ msgstr "Wszystkie cele na stronie" | ||
|
||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,6 +31,7 @@ | |
"farm", | ||
"warehouse", | ||
"wall", | ||
"watchtower", | ||
} | ||
|
||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
from base.models import Outline, WeightModel | ||
from rest_api.serializers import BUILDINGS | ||
from utils.basic.ruin import RuinHandle | ||
|
||
|
||
def test_buildings_from_serializer_match_from_ruin_and_models(): | ||
assert BUILDINGS == set(RuinHandle.BIG_LEVELS.keys()) | ||
assert BUILDINGS == set(RuinHandle.SMALL_LEVELS.keys()) | ||
assert BUILDINGS == set(building[0] for building in WeightModel.BUILDINGS) | ||
assert BUILDINGS == set(building[0] for building in Outline.BUILDINGS) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters