diff --git a/ram/bookshelf/migrations/0011_alter_book_language.py b/ram/bookshelf/migrations/0011_alter_book_language.py new file mode 100644 index 0000000..09c02b7 --- /dev/null +++ b/ram/bookshelf/migrations/0011_alter_book_language.py @@ -0,0 +1,121 @@ +# Generated by Django 5.0.1 on 2024-01-20 21:02 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("bookshelf", "0010_alter_bookimage_image"), + ] + + operations = [ + migrations.AlterField( + model_name="book", + name="language", + field=models.CharField( + choices=[ + ("af", "Afrikaans"), + ("ar", "Arabic"), + ("ar-dz", "Algerian Arabic"), + ("ast", "Asturian"), + ("az", "Azerbaijani"), + ("bg", "Bulgarian"), + ("be", "Belarusian"), + ("bn", "Bengali"), + ("br", "Breton"), + ("bs", "Bosnian"), + ("ca", "Catalan"), + ("ckb", "Central Kurdish (Sorani)"), + ("cs", "Czech"), + ("cy", "Welsh"), + ("da", "Danish"), + ("de", "German"), + ("dsb", "Lower Sorbian"), + ("el", "Greek"), + ("en", "English"), + ("en-au", "Australian English"), + ("en-gb", "British English"), + ("eo", "Esperanto"), + ("es", "Spanish"), + ("es-ar", "Argentinian Spanish"), + ("es-co", "Colombian Spanish"), + ("es-mx", "Mexican Spanish"), + ("es-ni", "Nicaraguan Spanish"), + ("es-ve", "Venezuelan Spanish"), + ("et", "Estonian"), + ("eu", "Basque"), + ("fa", "Persian"), + ("fi", "Finnish"), + ("fr", "French"), + ("fy", "Frisian"), + ("ga", "Irish"), + ("gd", "Scottish Gaelic"), + ("gl", "Galician"), + ("he", "Hebrew"), + ("hi", "Hindi"), + ("hr", "Croatian"), + ("hsb", "Upper Sorbian"), + ("hu", "Hungarian"), + ("hy", "Armenian"), + ("ia", "Interlingua"), + ("id", "Indonesian"), + ("ig", "Igbo"), + ("io", "Ido"), + ("is", "Icelandic"), + ("it", "Italian"), + ("ja", "Japanese"), + ("ka", "Georgian"), + ("kab", "Kabyle"), + ("kk", "Kazakh"), + ("km", "Khmer"), + ("kn", "Kannada"), + ("ko", "Korean"), + ("ky", "Kyrgyz"), + ("lb", "Luxembourgish"), + ("lt", "Lithuanian"), + ("lv", "Latvian"), + ("mk", "Macedonian"), + ("ml", "Malayalam"), + ("mn", "Mongolian"), + ("mr", "Marathi"), + ("ms", "Malay"), + ("my", "Burmese"), + ("nb", "Norwegian Bokmål"), + ("ne", "Nepali"), + ("nl", "Dutch"), + ("nn", "Norwegian Nynorsk"), + ("os", "Ossetic"), + ("pa", "Punjabi"), + ("pl", "Polish"), + ("pt", "Portuguese"), + ("pt-br", "Brazilian Portuguese"), + ("ro", "Romanian"), + ("ru", "Russian"), + ("sk", "Slovak"), + ("sl", "Slovenian"), + ("sq", "Albanian"), + ("sr", "Serbian"), + ("sr-latn", "Serbian Latin"), + ("sv", "Swedish"), + ("sw", "Swahili"), + ("ta", "Tamil"), + ("te", "Telugu"), + ("tg", "Tajik"), + ("th", "Thai"), + ("tk", "Turkmen"), + ("tr", "Turkish"), + ("tt", "Tatar"), + ("udm", "Udmurt"), + ("ug", "Uyghur"), + ("uk", "Ukrainian"), + ("ur", "Urdu"), + ("uz", "Uzbek"), + ("vi", "Vietnamese"), + ("zh-hans", "Simplified Chinese"), + ("zh-hant", "Traditional Chinese"), + ], + default="en", + max_length=7, + ), + ), + ] diff --git a/ram/portal/admin.py b/ram/portal/admin.py index cc637bb..848189c 100644 --- a/ram/portal/admin.py +++ b/ram/portal/admin.py @@ -6,6 +6,7 @@ from portal.models import SiteConfiguration, Flatpage @admin.register(SiteConfiguration) class SiteConfigurationAdmin(SingletonModelAdmin): + readonly_fields = ("site_name",) fieldsets = ( ( None, diff --git a/ram/portal/migrations/0016_remove_siteconfiguration_site_name.py b/ram/portal/migrations/0016_remove_siteconfiguration_site_name.py new file mode 100644 index 0000000..5d9c1e7 --- /dev/null +++ b/ram/portal/migrations/0016_remove_siteconfiguration_site_name.py @@ -0,0 +1,16 @@ +# Generated by Django 5.0.1 on 2024-01-20 21:02 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("portal", "0015_siteconfiguration_use_cdn"), + ] + + operations = [ + migrations.RemoveField( + model_name="siteconfiguration", + name="site_name", + ), + ] diff --git a/ram/portal/models.py b/ram/portal/models.py index 7305f8e..43a34d7 100644 --- a/ram/portal/models.py +++ b/ram/portal/models.py @@ -1,5 +1,6 @@ import django from django.db import models +from django.conf import settings from django.urls import reverse from django.dispatch.dispatcher import receiver from django.utils.safestring import mark_safe @@ -13,9 +14,6 @@ from ram.utils import slugify class SiteConfiguration(SingletonModel): - site_name = models.CharField( - max_length=256, default="Railroad Assets Manager" - ) site_author = models.CharField(max_length=256, blank=True) about = RichTextField(blank=True) items_per_page = models.CharField( @@ -44,6 +42,9 @@ class SiteConfiguration(SingletonModel): def __str__(self): return "Site Configuration" + def site_name(self): + return settings.SITE_NAME + def version(self): return app_version diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py index 2bfbe5b..5578c39 100644 --- a/ram/ram/__init__.py +++ b/ram/ram/__init__.py @@ -1,4 +1,4 @@ from ram.utils import git_suffix -__version__ = "0.9.5" +__version__ = "0.9.6" __version__ += git_suffix(__file__) diff --git a/ram/ram/admin.py b/ram/ram/admin.py index 2289a37..5862f90 100644 --- a/ram/ram/admin.py +++ b/ram/ram/admin.py @@ -1,10 +1,4 @@ from django.contrib import admin -from django.db.utils import OperationalError, ProgrammingError -from portal.utils import get_site_conf +from django.conf import settings -try: - site_name = get_site_conf().site_name -except (OperationalError, ProgrammingError): - site_name = "Train Assets Manager" - -admin.site.site_header = site_name +admin.site.site_header = settings.SITE_NAME diff --git a/ram/ram/settings.py b/ram/ram/settings.py index d1cdabf..b4122de 100644 --- a/ram/ram/settings.py +++ b/ram/ram/settings.py @@ -149,6 +149,8 @@ COUNTRIES_OVERRIDE = { "XX": "None", } +SITE_NAME = "Railroad Assets Manger" + # Image used on cards without a custom image uploaded. # The file must be placed in the root of the 'static' folder DEFAULT_CARD_IMAGE = "coming_soon.svg"