From 2d79a521335f9ab7844d191de747d8d7631ae31d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 27 Feb 2021 16:18:24 -0800 Subject: [PATCH] Translations working in templates --- bookwyrm/settings.py | 10 +++++----- bookwyrm/templates/layout.html | 6 +++--- celerywyrm/settings.py | 4 ++-- locale/en_BEEP/LC_MESSAGES/django.mo | Bin 0 -> 5268 bytes .../en_BEEP}/LC_MESSAGES/django.po | 0 locale/en_US/LC_MESSAGES/django.mo | Bin 0 -> 427 bytes .../en-US => locale/en_US}/LC_MESSAGES/django.po | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 locale/en_BEEP/LC_MESSAGES/django.mo rename {bookwyrm/locale/en-beep => locale/en_BEEP}/LC_MESSAGES/django.po (100%) create mode 100644 locale/en_US/LC_MESSAGES/django.mo rename {bookwyrm/locale/en-US => locale/en_US}/LC_MESSAGES/django.po (99%) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 4e8708b9c..de24c4f74 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -30,11 +30,6 @@ EMAIL_USE_TLS = env('EMAIL_USE_TLS', True) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) LOCALE_PATHS = [os.path.join(BASE_DIR, 'locale'),] -LANGUAGES = [ - ('en-US', _('English')), - ('en-beep', _('Beep')), -] - # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/ @@ -143,6 +138,11 @@ AUTH_PASSWORD_VALIDATORS = [ # https://docs.djangoproject.com/en/2.0/topics/i18n/ LANGUAGE_CODE = 'en-us' +LANGUAGES = [ + ('en-us', _('English')), + ('en-beep', _('Beep')), +] + TIME_ZONE = 'UTC' diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index c658ac3ff..70c44e078 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -55,13 +55,13 @@
{% if request.user.is_authenticated %} - Your shelves + {% trans "Your shelves" %} - Feed + {% trans "Feed" %} - Lists + {% trans "Lists" %} {% endif %}
diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py index c27072c2a..92986d8e4 100644 --- a/celerywyrm/settings.py +++ b/celerywyrm/settings.py @@ -142,9 +142,9 @@ LANGUAGE_CODE = 'en-us' TIME_ZONE = 'UTC' -USE_I18N = True +USE_I18N = False -USE_L10N = True +USE_L10N = False USE_TZ = True diff --git a/locale/en_BEEP/LC_MESSAGES/django.mo b/locale/en_BEEP/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..26c5ec5a39c06dae5cffd3fa1bf81783636b8d85 GIT binary patch literal 5268 zcmbuBe~cYf6~`}%6qZ(M1%Vdiw$OH$`nKJ*NO=Xi+x=0t?6zz70YX(e``+!_p|dlO znR&ZD|1d#IVuIj5{(!{(;~yp({D+|YVT~~=Bw|cNBTY<FX4;uYMu`mZ$RMmPYkhhuOA9)}-* z-+~{4--i6mi`+0_ehjaIKZWbytMG&Hw@{}43^&2Q!OP)0@M?G&gVf#tWp@+Y0&jyF zHv$LXA*k_>`~K5V`cFaGIpg_VxPkT$;I;5)a6LQ+cfdEG^w;;5{@wuP=QhtFcn$3l zcpaRDxN1)N_X$)Sz5wOlX(;P5O`TGLg2!8<;*WW|g`zO>qZ$pi{ia}~$ z54EnHQ1jdcHO~R4^-Mzfd))IeD0?0M{)4Nvik?$J`XkTdYqU4o4Lu) zosbZjeNg%bq2{l_?eI9{XP)3DKc4YCllHG`xKO&N1^PTg38Ah)cU>*<>xc-!|++(ejX~0KZL{ZWhi@ZL(P8;POE(r z)O^EG>)Q`+zKr$y_a`v&5&DJy|4UGI&O+(G?E7DX%G=j{`#hANZ$Vr#|MvY?69oCQ5q=zQfj7XT zP<9s}Av7tJ-f1X5zY0lzQ$eIRiRil+L%NsNKkFNx?RLUp($kdOczgOZhwmBW4_%5%P~iMW1r_PxDC10w{@QCQXSiiY)4c(?nMR=<%hoE&mben z9C9~7tV48ZpFW06sKGUgoX~^6ln2U@Pa^w$-(jfp;4Vbxg>pdop=%0ZJIy$9 z5YeT*z8}#ypzA*5QDhLg6HyN6dLQx$J#6pqxF8+K>@gQK!nkQ?)1;ZYEHnN0g}F^# zlmrc%C$`;c1i9NfU`A~e#;4SUn#*k`X{WXoWZ80(Htcd3MRwlV%*DBMinnet2qPOb z8inD}xv3*nGdiEN(O3vGbkil5n$db5E`@o=j5Zn)TThB^p7Nk+M&mrJj3sF+NpZxC zw)2IAK?UqogZaXfp-VG!Fifi4(tN?nWuBAdRB_Afe8+C@kAp=wfF9kMOgCM_Zrk3^ z(_r~(n;8q@x{J(M66ZlZw?T~ei(wpQIg=-;R@P+g^oKD%yPjr7qtrEHsgt86q&ix! zC+#>l<3S$SjIh<68Aqq<=eVo0iZqDA&$|Y1B8ROw(YoqE9wu={XI4+cmKs$v9ya2g zxjh-i#C;(sw!$vE)Y*uoX){kI=>ap*U?Y9FisvF86RY>6Y9`qs!oa$;;bt<4qGXw* zc)abhJfod9lQnyNz)Ys0iyKkL97+=QHfUt_l9jMDZPV*WUR?ZjS|o}MivVXD z(AMM^9k4osj*d-_*(2@6d6!nr(Uyy&G6v=HXZ?3vHM1^V46}?xv*Ruf3GHkY)Lmv~ z({L%Mclc`a+~=70gvk1^S55agIg|tu4JEcMw>YDzbE7+zZ+1@*nt9r>L~AiKbHS1` zb9@N;2BU~aofLK=P5Jca7F@K1LvzWZD|c{Nvn;1c+}vvCk`y!D4G8i<^yt}YYdUhu zua;~hRcOXa`?!heCBD7}y6ySLm=xpfI*ZOuwxbBAihvV}+UVT3|5|sBerTDPTIDS=o?=k z5F8;L0$d)`oJz%ES!55Z=V&9P1~p`-5|0n09<-YaIS2Pv^`^b!r)aFTV|1uC2)oIs z2lWNEIZ*^EQ;o`lNt(bG5$dAj>PYG>EfECu!BrBqXmr<{T@$dr^&4&m(D= zxpr$XcKN*wikt1A=_)lBEUpRd6WuXBaAZsq?K zy*jWayxpo+sQO}c!E<3kqgO@PUih5lzJN(}aLq)edaq;^CVK^|H^I9$t~cSTT2*+_ zD^41>s&aJ)lyh|tNgX2HH{Be$M4c*pxm2Yp6nw4f8NOtx(g;&jC_Qz3=smuxDiylD z+k2Oz`C@3d78T0A7Wrotq7@rbFGJFMTGjN$r>B0A!lU=T?#N27?iBqOtvjWvbXLu{ zy3DM+3geYBqhZB>;^ym%I*SU^8?$25$Mk=%D#a3HXiZtsB)+iprs-8Dz4R5Ocr0%J E1@1Jx!~g&Q literal 0 HcmV?d00001 diff --git a/bookwyrm/locale/en-beep/LC_MESSAGES/django.po b/locale/en_BEEP/LC_MESSAGES/django.po similarity index 100% rename from bookwyrm/locale/en-beep/LC_MESSAGES/django.po rename to locale/en_BEEP/LC_MESSAGES/django.po diff --git a/locale/en_US/LC_MESSAGES/django.mo b/locale/en_US/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..810d271771144ebbac86a529be1c7ed4b0c841d4 GIT binary patch literal 427 zcmZ9I(MrQG6o#v)7rpe_i{qW5scl6Z*(yWbV9;WnRj=cA>>^!Kl62^U_y#_g&*I4h z2ma(E=fMBNpM3A{d`q7EM|b#(ad&e}#u)rZ+a7>h1@tj4Uj@%gT= wXxK>2^jxZ%L+?epuxvUb8aCEuX*sBNz1l48!|#|KDLBj^Iqru+BaQ#lA7^EDYXATM literal 0 HcmV?d00001 diff --git a/bookwyrm/locale/en-US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po similarity index 99% rename from bookwyrm/locale/en-US/LC_MESSAGES/django.po rename to locale/en_US/LC_MESSAGES/django.po index 9ecbea8ca..475f4ecfc 100644 --- a/bookwyrm/locale/en-US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -98,7 +98,7 @@ msgstr "" #: bookwyrm/templates/book.html:215 bookwyrm/templates/search_results.html:84 #: bookwyrm/templates/user/user_layout.html:60 msgid "Lists" -msgstr "lirsts" +msgstr "" #: bookwyrm/templates/book.html:244 msgid "rated it"