Skip to content
This repository has been archived by the owner on Nov 21, 2023. It is now read-only.

Commit

Permalink
[Fix] Translation issues
Browse files Browse the repository at this point in the history
  • Loading branch information
M0NsTeRRR committed Aug 8, 2022
1 parent 9636801 commit 801a298
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 12 deletions.
10 changes: 5 additions & 5 deletions les_assets_generator/app/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@


class Asset(models.Model):
title = models.CharField(primary_key=True, max_length=200, verbose_name=_("title"))
picture = models.ImageField(upload_to="assets", verbose_name=_("picture"))
title = models.CharField(_("title"), primary_key=True, max_length=200)
picture = models.ImageField(_("picture"), upload_to="assets")

def __str__(self):
return self.title
Expand All @@ -17,10 +17,10 @@ class Meta:

class Parameter(models.Model):
asset = models.ForeignKey(Asset, on_delete=models.CASCADE)
name = models.CharField(max_length=200, verbose_name=_("name"))
name = models.CharField(_("name"), max_length=200)
color = ColorField(verbose_name=_("color"))
font_url = models.URLField(verbose_name=_("font url"))
font_size = models.IntegerField(default=0, verbose_name=_("font size"))
font_url = models.URLField(_("font url"))
font_size = models.IntegerField(_("font size"), default=0)
x = models.IntegerField(default=0)
y = models.IntegerField(default=0)

Expand Down
11 changes: 11 additions & 0 deletions les_assets_generator/assets_generator/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import os

import dj_database_url
from django.utils.translation import gettext_lazy as _
from dotenv import load_dotenv

load_dotenv()
Expand Down Expand Up @@ -46,6 +47,7 @@
MIDDLEWARE = [
"django.middleware.security.SecurityMiddleware",
"django.contrib.sessions.middleware.SessionMiddleware",
"django.middleware.locale.LocaleMiddleware",
"django.middleware.common.CommonMiddleware",
"django.middleware.csrf.CsrfViewMiddleware",
"django.contrib.auth.middleware.AuthenticationMiddleware",
Expand Down Expand Up @@ -134,6 +136,15 @@

USE_TZ = True

LOCALE_PATHS = [
os.path.join(BASE_DIR, "locale/"),
]

LANGUAGES = (
("en", _("English")),
("fr", _("French")),
)


# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/4.0/howto/static-files/
Expand Down
22 changes: 15 additions & 7 deletions les_assets_generator/locale/fr/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-08-07 22:40+0200\n"
"POT-Creation-Date: 2022-08-08 09:38+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"
Expand All @@ -18,19 +18,19 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"

#: app/models.py:8
#: app/models.py:7
msgid "title"
msgstr "titre"

#: app/models.py:9
#: app/models.py:8
msgid "picture"
msgstr "image"

#: app/models.py:15
#: app/models.py:14
msgid "asset"
msgstr "asset"

#: app/models.py:16
#: app/models.py:15
msgid "assets"
msgstr "assets"

Expand All @@ -50,14 +50,22 @@ msgstr "url de la police"
msgid "font size"
msgstr "taille de la police"

#: app/models.py:32
#: app/models.py:35
msgid "parameter"
msgstr "paramètre"

#: app/models.py:33
#: app/models.py:36
msgid "parameters"
msgstr "paramètres"

#: assets_generator/settings/base.py:144
msgid "English"
msgstr "Anglais"

#: assets_generator/settings/base.py:145
msgid "French"
msgstr "Français"

#: templates/admin/login.html:14
msgid "Login via Google"
msgstr "Se connecter avec Google"

0 comments on commit 801a298

Please sign in to comment.