From 0a793b79543ff1851611d0aa989934847661a2e3 Mon Sep 17 00:00:00 2001 From: Xeniac Date: Wed, 17 Jan 2018 16:19:48 +0100 Subject: [PATCH] Fixed: Changed the environ to ORIGINAL_RECIPIENT --- Gruntfile.js | 11 +- package.json | 2 +- src/content/locale/de/LC_MESSAGES/django.mo | Bin 3144 -> 3305 bytes src/content/locale/de/LC_MESSAGES/django.po | 177 +++---- src/events/locale/de/LC_MESSAGES/django.mo | Bin 3952 -> 3707 bytes src/events/locale/de/LC_MESSAGES/django.po | 219 ++++---- src/events/templates/events/event_list.html | 1 - src/kasu/locale/de/LC_MESSAGES/django.po | 99 ++-- src/kasu/static/css/kasu.css | 4 + src/kasu/static/js/jquery.formset.js | 231 ++++++++ src/kasu/static/less/common.less | 3 +- src/mahjong_ranking/forms.py | 16 +- .../locale/de/LC_MESSAGES/django.mo | Bin 4832 -> 4415 bytes .../locale/de/LC_MESSAGES/django.po | 447 ++++++++-------- .../mahjong_ranking/eventhanchan_form.html | 83 ++- .../mahjong_ranking/eventhanchan_list.html | 3 +- src/mahjong_ranking/views.py | 2 +- .../locale/de/LC_MESSAGES/django.po | 134 ++--- .../locale/de/LC_MESSAGES/django.mo | Bin 10390 -> 9885 bytes .../locale/de/LC_MESSAGES/django.po | 359 ++++++------- src/utils/locale/de/LC_MESSAGES/django.po | 500 +++++++++--------- 21 files changed, 1297 insertions(+), 994 deletions(-) create mode 100644 src/kasu/static/js/jquery.formset.js diff --git a/Gruntfile.js b/Gruntfile.js index 55ce42a..f7edc13 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -8,7 +8,7 @@ module.exports = function(grunt) { options: { paths: ['src/kasu/static/less'], compress: false, - optimization:9, + optimization: 9, ieCompat: false, }, kasu: { @@ -21,10 +21,11 @@ module.exports = function(grunt) { report: 'min' }, kasu: { - src: 'static/css/kasu.css', - dest: 'static/css/kasu.css' - } - }, + files: { + 'src/kasu/static/css/kasu.min.css': ['src/kasu/static/css/kasu.css'], + }, + }, + }, watch: { styles: { files: ['src/kasu/static/less/*.less'], // which files to watch diff --git a/package.json b/package.json index 7fac8e7..238c86f 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "grunt": ">=0.4.5", "grunt-contrib-less": ">=1.0.1", "grunt-contrib-watch": ">=0.6.1", - "grunt-more-css": ">=0.1.0" + "grunt-more-css": "^0.1.1" }, "dependencies": { "ckeditor-dev": "git://github.com/ckeditor/ckeditor-dev.git" diff --git a/src/content/locale/de/LC_MESSAGES/django.mo b/src/content/locale/de/LC_MESSAGES/django.mo index 61bad0e44b8c877919322d1bbe86956c605c06c8..e1a691501fcd1b11c3a89dfb3fad0d824c07f96b 100644 GIT binary patch delta 1675 zcmZ|O%WGU!9Ki9DG|x$@X)7@nwWmrOX*-#jkkK|awvA08G>Ep5NTt*>GiPQlbLZai zKGG&G1{LZbaJ8%8viQJ7TXECuB2s)nAtJc2&_EZ0n}VA{LBGH0Ev^iA=5x>M_xqi5 zCb!1^e5QS8XU}JfzgPJ@%jfSdX({#dw*MUB^%vR$_&YvpcHx& zd+~dect7H9yqk_c#2)giUS=I&AcHSp5gAkOAdfnqw#z8<>L>{kltR|h@vA6>e4UP8 z$3@yV@i2}sIDzx{9A3gh5z)=pzQ2E%EE32rGO!n!giqqdJ$!( zIh4Dd!aaBzc~pZh8DGXMet`S&OO(QIqZImEhVz$+f6y_7TPTU2CJV1hql_O!S&&C5 z=oLJL$FPW(aUZUu#w{%1Hnu7Ai^xBSnn8(sB6Z;{UYM(va2J--_C*|{{V~d~dJQ=g z^%Xvk-=^(N>}&v~z^&ora?kpWncgE^ZO=5V_NzLoTir4>t4*k#NMCeZSDRMLnm{|A ze*4TqsO>~e*Q2O4oy%4Hrg6N9vfs>=T)&okx4DuH-MDr>rxqUvik!&pgj@0B@rrhx zhLy;XuS-^k)_S_MqBEVmamjVc$@_h8B=`D`wS6zL9urquR+R&5B3seEr>tj61SDsZ z;ZRkbAdK|m2_{l5GwF$2mCh1+0vp;$g=X2Rke!t4x?;m};Itx#fMMMP?41`XS7BtL zI8<*2$$R|^BZss3Lbg!QlatfM{K0%7S??dKJnEd(h2r#Nk z>(cn^^}q=u$9Q_y1~q-OVZ!+MCF@mIJSIDK!bGo)v(T%>oOgE7n&z}VY2zrQzN5+U zfh);B1EXC>lFfmax(idu=-}LOTVrF=jhjtFYgp2#l{9Sw#jey#g)w=_j_z*D z%(N5)7s*8ty^H}5B6#s8T7m~LQVKnYAP9me*c@6a{sZw?Pkw(pgMu&f%;(*A-g*B$ zyZh_NSH;fGaNnk(%n=U~H!{X7VY8PT<&8dL2JubI;U?aPA7DRzocbB=;`5iNe&1jg zzsEe@Oxu4!z4sR~PRHC$8*=v~9fxo)9Y#?TSFwN#IDn^613ZtK;5^=oYp96>SkV3Ex9K-$JG|+c?Sm<~o)AH2jf1*u|(+%^p<85>Db6YJiidg`7>FpGPk95;r~f zaT)`B2tUMeyoQJH4r<(CcG1K9W*-&3SVA4u0n|}WqZYD&df_;#-*Wo-Ib1OQGi;&734A--1Oqxr~%(aE#MId;V zYQR5{%lyr4H)h$szJw)Y(`F*Iiki5Fn)oRsQ~#Dnm4D?-FKI>k;#7!72$g-r6Wv;} z^F7qHGfRvTRYED4CG_*vBD5ft2NJq>ZAztwIM}TvC)H7&bOI_PgpO6YR#7S*?$(m@ zD0j;51W`=ebt;pDequV2DMG2z=^Y^SzoHY+sp$kbfNps_K|?0xP?z}Y-tDco`VME} zmF)6(z2S#8@}s7+-o=Z~3qtF+ZPak~M1AG7Z8&eu1@UHfF}{^8nzUT7`wR(t)Dx9-Yy=e6eTDKETaYnNT%{PyB2e4zV(o#ySD z%daf2JR2X&ZNxw2#xvFUT5cpW8}|-;yR|dmW#a9@rTxcUVC#P5n$`v3YJ;I7>$j4< Wo=EoEQ#cu)E7\n" +"POT-Creation-Date: 2018-01-11 22:50+0100\n" +"PO-Revision-Date: 2018-01-12 15:25+0105\n" +"Last-Translator: b'Christian Berg '\n" "Language-Team: Deutsch <>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Translated-Using: django-rosetta 0.7.2\n" "X-Generator: Poedit 1.8.9\n" +"X-Translated-Using: django-rosetta 0.7.14\n" -#: content/feeds.py:16 +#: src/content/feeds.py:18 msgid "Current news from Kasu" msgstr "Aktuelle Nachrichten von Kasu" -#: content/feeds.py:43 +#: src/content/feeds.py:51 msgid "Latest comments on kasu.at" msgstr "Neueste Kommentare auf Kasu.at " -#: content/feeds.py:44 +#: src/content/feeds.py:52 msgid "Kasu - latest comments" msgstr "Kasu - neue Kommentare" -#: content/forms.py:52 content/models.py:308 +#: src/content/forms.py:57 src/content/models.py:318 msgid "Please upload a PDF-File to this PDF-Page." msgstr "Bitte eine PDF Datei für diese PDF Seite hochladen." -#: content/models.py:62 +#: src/content/models.py:76 msgid "Headline" msgstr "Schlagzeile" -#: content/models.py:64 +#: src/content/models.py:78 msgid "Content" msgstr "Inhalt" -#: content/models.py:66 content/models.py:137 -#: content/templates/content/article_detail.html:25 +#: src/content/models.py:82 src/content/models.py:150 +#: src/content/templates/content/article_detail.html:25 msgid "Category" msgstr "Kategorie" -#: content/models.py:67 content/models.py:130 +#: src/content/models.py:83 src/content/models.py:143 msgid "Image" msgstr "Bild" -#: content/models.py:69 content/models.py:132 +#: src/content/models.py:85 src/content/models.py:145 msgid "Slug" msgstr "Slug" -#: content/models.py:71 content/templates/content/article_detail.html:23 +#: src/content/models.py:88 +#: src/content/templates/content/article_detail.html:23 msgid "Author" msgstr "Autor" -#: content/models.py:72 +#: src/content/models.py:89 msgid "Status" msgstr "Status" -#: content/models.py:74 +#: src/content/models.py:91 msgid "Created" msgstr "Erstellt" -#: content/models.py:75 +#: src/content/models.py:92 msgid "Modified" msgstr "Bearbeitet" -#: content/models.py:80 +#: src/content/models.py:97 msgid "Article" msgstr "Artikel" -#: content/models.py:81 +#: src/content/models.py:98 msgid "Articles" msgstr "Artikel" -#: content/models.py:126 content/models.py:127 +#: src/content/models.py:139 src/content/models.py:140 msgid "Name" msgstr "Name" -#: content/models.py:128 content/models.py:129 +#: src/content/models.py:141 src/content/models.py:142 msgid "Description" msgstr "Beschreibung" -#: content/models.py:138 +#: src/content/models.py:151 msgid "Categories" msgstr "Kategorien" -#: content/models.py:169 content/models.py:175 +#: src/content/models.py:182 src/content/models.py:188 msgid "The short name for the menu-entry of this page" msgstr "Ein kurzer Name für den Menüeintrag" -#: content/models.py:180 content/models.py:185 +#: src/content/models.py:193 src/content/models.py:198 msgid "The page title as you'd like it to be seen by the public" -msgstr "" +msgstr "Der Seitentitel der öffentlich angezeigt werden soll" -#: content/models.py:187 +#: src/content/models.py:200 msgid "slug" msgstr "Slug" -#: content/models.py:190 +#: src/content/models.py:203 msgid "" -"The name of the page as it will appear in URLs e.g http://domain.com/blog/" -"[my-slug]/" +"The name of the page as it will appear in URLs e.g " +"http://domain.com/blog/[my-slug]/" msgstr "" +"Wie die Seite in der URL aufscheint also http://domain.com/blog/[slug]" -#: content/models.py:199 +#: src/content/models.py:212 msgid "Path" msgstr "Pfad" -#: content/models.py:211 +#: src/content/models.py:224 msgid "Position" msgstr "Position" -#: content/models.py:216 +#: src/content/models.py:229 msgid "status" msgstr "Status" -#: content/models.py:219 content/models.py:221 -#, fuzzy +#: src/content/models.py:232 src/content/models.py:234 #| msgid "Description" msgid "search description" -msgstr "Beschreibung" +msgstr "Beschreibung für Suchfunktion" -#: content/models.py:224 -#, fuzzy +#: src/content/models.py:237 #| msgid "Content" msgid "content type" -msgstr "Inhalt" +msgstr "Inhaltstyp" -#: content/models.py:229 +#: src/content/models.py:242 msgid "enable comments" msgstr "Kommentare möglich" -#: content/models.py:234 +#: src/content/models.py:247 msgid "Template" msgstr "Vorlage" -#: content/models.py:242 -#, fuzzy +#: src/content/models.py:255 #| msgid "created on" msgid "first created at" msgstr "erstellt am" -#: content/models.py:247 +#: src/content/models.py:260 msgid "latest updated at" -msgstr "" +msgstr "letzte Aktualisierung am" -#: content/models.py:322 +#: src/content/models.py:331 msgid "Page" msgstr "Seite" -#: content/models.py:323 +#: src/content/models.py:332 msgid "Pages" msgstr "Seiten" -#: content/templates/content/article_archive.html:5 -#: content/templates/content/article_archive.html:20 +#: src/content/templates/content/article_archive.html:5 +#: src/content/templates/content/article_archive.html:20 msgid "Article Archive" msgstr "Nachrichtenarchiv" -#: content/templates/content/article_archive.html:35 -#: content/templates/content/article_archive_month.html:5 -#: content/templates/content/article_archive_year.html:7 +#: src/content/templates/content/article_archive.html:35 +#: src/content/templates/content/article_archive_month.html:5 +#: src/content/templates/content/article_archive_year.html:7 msgid "Archive" msgstr "Archiv" -#: content/templates/content/article_archive.html:56 +#: src/content/templates/content/article_archive.html:56 msgid "All Categories" msgstr "Alle Kategorien" -#: content/templates/content/article_archive.html:71 +#: src/content/templates/content/article_archive.html:71 msgid "created on" msgstr "erstellt am" -#: content/templates/content/article_archive.html:73 +#: src/content/templates/content/article_archive.html:73 msgid "by" msgstr "von" -#: content/templates/content/article_archive.html:74 -#: content/templates/content/article_archive.html:75 +#: src/content/templates/content/article_archive.html:74 +#: src/content/templates/content/article_archive.html:75 msgid "comments" msgstr "Kommentare" -#: content/templates/content/article_archive.html:81 +#: src/content/templates/content/article_archive.html:81 msgid "Read More" msgstr "Mehr lesen" -#: content/templates/content/article_archive.html:86 +#: src/content/templates/content/article_archive.html:86 msgid "We're sorry. Your search yielded no results." msgstr "Es tut uns leid. Deine Suche ergab keine Treffer." -#: content/templates/content/article_archive.html:104 +#: src/content/templates/content/article_archive.html:104 msgid "Add Article" msgstr "neuer Artikel " -#: content/templates/content/article_archive_month.html:7 +#: src/content/templates/content/article_archive_month.html:7 msgid "back" msgstr "Zurück" -#: content/templates/content/article_detail.html:24 +#: src/content/templates/content/article_detail.html:24 msgid "Created on" msgstr "Erstellt am" -#: content/templates/content/article_detail.html:36 +#: src/content/templates/content/article_detail.html:36 msgid "share on" msgstr "Teile auf" -#: content/templates/content/article_detail.html:51 -#: content/templates/content/article_form.html:20 content/views.py:138 +#: src/content/templates/content/article_detail.html:51 +#: src/content/views.py:156 msgid "Edit Article" msgstr "Artikel bearbeiten" -#: content/templates/content/article_form.html:20 content/views.py:139 -msgid "Create Article" -msgstr "Artikel erstellen" - -#: content/templates/content/article_form.html:25 -#: content/templates/content/page_form.html:49 -#: content/templates/content/page_form.html:56 +#: src/content/templates/content/article_form.html:32 +#: src/content/templates/content/page_form.html:42 +#: src/content/templates/content/page_form.html:49 msgid "German" msgstr "Deutsch" -#: content/templates/content/article_form.html:26 -#: content/templates/content/page_form.html:50 -#: content/templates/content/page_form.html:64 +#: src/content/templates/content/article_form.html:33 +#: src/content/templates/content/page_form.html:43 +#: src/content/templates/content/page_form.html:57 msgid "English" msgstr "Englisch" -#: content/templates/content/article_form.html:45 -#: content/templates/content/page_form.html:73 +#: src/content/templates/content/article_form.html:59 +#: src/content/templates/content/page_form.html:66 msgid "reset" msgstr "Zurücksetzen" -#: content/templates/content/article_form.html:46 -#: content/templates/content/page_form.html:74 +#: src/content/templates/content/article_form.html:60 +#: src/content/templates/content/page_form.html:67 msgid "save" msgstr "Speichern" -#: content/templates/content/page_form.html:5 -#: content/templates/content/page_form.html:42 +#: src/content/templates/content/page_form.html:5 +#: src/content/templates/content/page_form.html:35 msgid "Edit Page" msgstr "Seite bearbeiten" -#: content/templates/content/page_form.html:5 -#: content/templates/content/page_form.html:28 -#: content/templates/content/page_form.html:42 +#: src/content/templates/content/page_form.html:5 +#: src/content/templates/content/page_form.html:19 +#: src/content/templates/content/page_form.html:35 msgid "Add Page" msgstr "Seite hinzufügen" -#: content/templates/content/page_form.html:27 +#: src/content/templates/content/page_form.html:18 msgid "Edit" msgstr "Bearbeiten" -#: content/templates/content/page_form.html:44 +#: src/content/templates/content/page_form.html:37 msgid "HTML Specific" msgstr "HTML spezifisch" -#: content/views.py:35 +#: src/content/views.py:53 msgid "This Category does not exist." msgstr "Diese Kategorie existiert nicht." -#: content/views.py:205 +#: src/content/views.py:157 +msgid "Create Article" +msgstr "Artikel erstellen" + +#: src/content/views.py:233 #, python-format msgid "No Page found matching the Path %s" msgstr "Keine Seite unter dem Pfad %s gefunden" -#: content/views.py:219 +#: src/content/views.py:262 #, python-format msgid "No PDF Document found matching the Path %s" msgstr "Kein PDF Dokument unter dem Pfad %s gefunden." diff --git a/src/events/locale/de/LC_MESSAGES/django.mo b/src/events/locale/de/LC_MESSAGES/django.mo index 58269194c092480d88ee27b8c02c318a488d86ee..01454b99e7de6869c8fbecc8370aad0eec4ac7f5 100644 GIT binary patch delta 1360 zcmYMzOGs2v9LMpKqnTrwnl!zPYeq&gF*9hyP-YJzD9U7l7WTO2ZJHeK$jlw-0SyGz zLPEl#S|mXbL=i*~1U;Zu5mex!O@tIdi=q}is380P>OgYme$M%y*Z-Vz{k-tkg3{~y z@^gm24g41HTUDl-F+Jt~ZK1e}dKI3qj^I@47jYV1#!9?~JmwZJwco*NypPN935M|t zhKwnhNeUGNLcC^R6>2~Pr(?5?$85a=8;Ea4EwC4rK-xNpJmxSjwU>}3%t=(gVe46} zVSRInLOl&P{sxSBh#K$=XW}?2k+-M`Kcf=-ZsQ?>wbW~I4mP32C$SFK*!Jz#UYtd| zfEBE7PEpX&p2iwHk6ZC7YND^GM1CTV33JY@ZR$|<2#(=GRR8;^ojyX2*gQog_}sQn zpb~qBrP&m|Q_z4KUYa<9ny3*KUu5I0sLvyg3^8qZZwlWGCaM2m7us1H7pxQ8gxc5+ z)Sd6)rFjpc*2#rAf5w_30S!2YQ5;5Pco#L`DQc%LP|VCq~x>GZa&KakH9 zf{g1s>%4s0S=H|rik*i%zwfY5=Zv@94LVvF=%|JBy_#Vwl6N${kl*(xFRfA5{Ow3GD8;2ectqe?P z5s^?qxXYq8t|I8Mh;So>K~MyOV2cW@MZdpYp$_x^e)rz*+88FdO#S@r3PPfy)^mg8a;V9tvR0@(I*>6Of;I!9xMPf%1E2 zIR!oJZ$8n;=f&K@08x>KCgj6hSO^u!W{8Waf(o#~j<>-)`rWVyhM?vT!e#KPeLrIP z5Ed~045qTbc}qj3eGfhG1MGk^Pz%))wgPE_3ZMfj!yel|4)4-G3FYr%F`6a~Qeu+} zHC_N$!Xo>ACroOgI_uD6U$j7tw?nRj>4L;!df-!+F(+V)wP~cf|JZWK(~YXp{l*0n`yZf-3oQ%U4hfOxgZ4)CRLqnf-wL%x@kF zG=rPG3YI|KiCU=2bV60E7s@Y^w2jM98Qp@4a15%1kD)S}fL-tg@mCAmX9nrbyGRc}yE!v3mw_I<=d))&mDY59e;UDS4$r_)( z-d9oW4O9mGf$jc)-=Eoe$k!Db2*<\n" +"POT-Creation-Date: 2018-01-11 22:50+0100\n" +"PO-Revision-Date: 2018-01-12 15:25+0105\n" +"Last-Translator: b'Christian Berg '\n" "Language-Team: Kasu \n" "Language: de\n" "MIME-Version: 1.0\n" @@ -17,60 +17,60 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.8.9\n" -"X-Translated-Using: django-rosetta 0.7.6\n" +"X-Translated-Using: django-rosetta 0.7.14\n" -#: events/admin.py:14 events/models.py:82 +#: src/events/admin.py:14 src/events/models.py:82 msgid "Event Series" msgstr "Veranstaltungsreihen" -#: events/forms.py:18 +#: src/events/forms.py:17 msgid "Images" msgstr "Bilder" -#: events/forms.py:46 +#: src/events/forms.py:46 msgid "start" msgstr "Beginn" -#: events/forms.py:50 +#: src/events/forms.py:49 msgid "end" msgstr "Ende" -#: events/models.py:52 events/models.py:176 events/models.py:217 +#: src/events/models.py:52 src/events/models.py:176 src/events/models.py:217 msgid "Name" msgstr "Name" -#: events/models.py:53 events/models.py:177 events/models.py:225 +#: src/events/models.py:53 src/events/models.py:177 src/events/models.py:225 msgid "Description" msgstr "Beschreibung" -#: events/models.py:55 events/templates/events/event_detail.html:29 -#: events/templates/events/event_detail.html:87 -#: events/templates/events/event_list.html:28 -#: events/templates/events/photo_upload.html:13 +#: src/events/models.py:55 src/events/templates/events/event_detail.html:29 +#: src/events/templates/events/event_detail.html:87 +#: src/events/templates/events/event_list.html:28 +#: src/events/templates/events/photo_upload.html:13 msgid "Start" msgstr "Beginn" -#: events/models.py:56 events/templates/events/event_detail.html:30 -#: events/templates/events/event_detail.html:89 +#: src/events/models.py:56 src/events/templates/events/event_detail.html:30 +#: src/events/templates/events/event_detail.html:89 msgid "End" msgstr "Ende" -#: events/models.py:57 events/models.py:185 -#: events/templates/events/event_detail.html:34 -#: events/templates/events/event_detail.html:80 -#: events/templates/events/event_detail.html:92 +#: src/events/models.py:57 src/events/models.py:185 +#: src/events/templates/events/event_detail.html:34 +#: src/events/templates/events/event_detail.html:80 +#: src/events/templates/events/event_detail.html:92 msgid "Homepage" msgstr "Homepage" -#: events/models.py:59 events/models.py:179 events/models.py:219 +#: src/events/models.py:59 src/events/models.py:179 src/events/models.py:219 msgid "Image" msgstr "Bild" -#: events/models.py:66 +#: src/events/models.py:66 msgid "Mahjong Tournament" msgstr "Mahjong Turnier" -#: events/models.py:68 +#: src/events/models.py:68 msgid "" "This event is a tournament, different rules apply for the kyu " "ranking." @@ -78,11 +78,11 @@ msgstr "" "Diese Veranstaltung ist ein Turnier, es gelten andere Regeln für das Kyu " "Ranking." -#: events/models.py:72 +#: src/events/models.py:72 msgid "Mahjong Season" msgstr "Mahjong Saison" -#: events/models.py:83 +#: src/events/models.py:83 msgid "" "Wenn dieser Event zu einer Veranstaltungsreihe gehört werden Ort, " "Beschreibung, Bild und Homepage von dem hier angegebenen Event " @@ -91,244 +91,245 @@ msgstr "" "Wenn dieser Termin zu einer Veranstaltungsreihe gehört werden Ort, " "Beschreibung, Bild und Homepage von dem hier angegebenen Event übernommen." -#: events/models.py:92 events/models.py:195 events/models.py:247 +#: src/events/models.py:92 src/events/models.py:195 src/events/models.py:248 msgid "first created at" -msgstr "" +msgstr "erstellt am" -#: events/models.py:97 events/models.py:200 events/models.py:252 +#: src/events/models.py:97 src/events/models.py:200 src/events/models.py:253 msgid "latest updated at" -msgstr "" +msgstr "letzte Aktualisierung am" -#: events/models.py:103 +#: src/events/models.py:103 msgid "Event" msgstr "Termin" -#: events/models.py:104 +#: src/events/models.py:104 msgid "Events" msgstr "Termine" -#: events/models.py:117 +#: src/events/models.py:117 msgid "A event can't end before it had started" msgstr "Eine Veranstaltung kann nicht enden bevor sie begonnen hat" -#: events/models.py:186 +#: src/events/models.py:186 msgid "Postal Code" msgstr "Postleitzahl" -#: events/models.py:187 +#: src/events/models.py:187 msgid "Street Address" msgstr "Straße" -#: events/models.py:188 +#: src/events/models.py:188 msgid "Locality" msgstr "Ort" -#: events/models.py:189 +#: src/events/models.py:189 msgid "Country" msgstr "Land" -#: events/models.py:204 +#: src/events/models.py:204 msgid "Venue" msgstr "Veranstaltungsort" -#: events/models.py:205 +#: src/events/models.py:205 msgid "Venues" msgstr "Veranstaltungsorte" -#: events/models.py:231 +#: src/events/models.py:232 msgid "Startpage" msgstr "Startseite" -#: events/models.py:234 +#: src/events/models.py:235 msgid "Display this Photo on the Startpage Teaser" msgstr "Foto als Teaser auf der Startseite verwenden." -#: events/models.py:236 +#: src/events/models.py:237 msgid "Published on" msgstr "Veröffentlicht am" -#: events/models.py:238 +#: src/events/models.py:239 msgid "Number of views" msgstr "Wie oft gesehen" -#: events/models.py:262 events/templates/events/event_archive.html:38 -#: events/templates/events/event_list.html:18 +#: src/events/models.py:263 src/events/templates/events/event_archive.html:38 +#: src/events/templates/events/event_list.html:18 msgid "Event Image" msgstr "Veranstaltungsbild" -#: events/models.py:263 +#: src/events/models.py:264 msgid "Event Images" msgstr "Veranstaltungsbilder" -#: events/templates/events/event_archive.html:5 -#: events/templates/events/event_archive.html:9 +#: src/events/templates/events/event_archive.html:5 +#: src/events/templates/events/event_archive.html:9 msgid "Event Archive" msgstr "Veranstaltungsarchiv" -#: events/templates/events/event_archive.html:42 -#: events/templates/events/event_detail.html:85 -#: events/templates/events/event_list.html:22 -#: events/templates/events/photo_detail.html:53 +#: src/events/templates/events/event_archive.html:42 +#: src/events/templates/events/event_detail.html:85 +#: src/events/templates/events/event_list.html:22 +#: src/events/templates/events/photo_detail.html:53 msgid "Date" msgstr "Datum" -#: events/templates/events/event_archive.html:47 +#: src/events/templates/events/event_archive.html:47 msgid "Time" msgstr "Zeit" -#: events/templates/events/event_archive.html:49 -#: events/templates/events/photo_upload.html:16 +#: src/events/templates/events/event_archive.html:49 +#: src/events/templates/events/photo_upload.html:16 msgid "from" msgstr "von" -#: events/templates/events/event_archive.html:49 -#: events/templates/events/photo_upload.html:16 +#: src/events/templates/events/event_archive.html:49 +#: src/events/templates/events/photo_upload.html:16 msgid "to" msgstr "bis" -#: events/templates/events/event_archive.html:57 -#: events/templates/events/event_detail.html:31 -#: events/templates/events/event_detail.html:72 -#: events/templates/events/event_list.html:32 -#: events/templates/events/photo_upload.html:23 +#: src/events/templates/events/event_archive.html:57 +#: src/events/templates/events/event_detail.html:31 +#: src/events/templates/events/event_detail.html:72 +#: src/events/templates/events/event_list.html:32 +#: src/events/templates/events/photo_upload.html:23 msgid "Location" msgstr "Ort" -#: events/templates/events/event_archive.html:58 -#: events/templates/events/event_list.html:35 -#: events/templates/events/photo_upload.html:25 -#: events/templates/events/photo_upload.html:26 +#: src/events/templates/events/event_archive.html:58 +#: src/events/templates/events/event_list.html:35 +#: src/events/templates/events/photo_upload.html:25 +#: src/events/templates/events/photo_upload.html:26 msgid "Comments" msgstr "Kommentare" -#: events/templates/events/event_archive.html:59 -#: events/templates/events/event_detail.html:36 -#: events/templates/events/event_detail.html:48 -#: events/templates/events/photo_upload.html:28 -#: events/templates/events/photo_upload.html:29 +#: src/events/templates/events/event_archive.html:59 +#: src/events/templates/events/event_detail.html:36 +#: src/events/templates/events/event_detail.html:48 +#: src/events/templates/events/photo_list.html:4 +#: src/events/templates/events/photo_upload.html:28 +#: src/events/templates/events/photo_upload.html:29 msgid "Photos" msgstr "Fotos" -#: events/templates/events/event_archive.html:60 -#: events/templates/events/event_archive.html:61 -#: events/templates/events/event_detail.html:35 -#: events/templates/events/event_detail.html:51 +#: src/events/templates/events/event_archive.html:60 +#: src/events/templates/events/event_archive.html:61 +#: src/events/templates/events/event_detail.html:35 +#: src/events/templates/events/event_detail.html:51 msgid "Hanchans" msgstr "Hanchans" -#: events/templates/events/event_detail.html:37 +#: src/events/templates/events/event_detail.html:37 msgid "tourney" msgstr "Turnier" -#: events/templates/events/event_detail.html:37 +#: src/events/templates/events/event_detail.html:37 msgid "other rules apply here" msgstr "hier gelten andere Regeln" -#: events/templates/events/event_detail.html:45 +#: src/events/templates/events/event_detail.html:45 msgid "Info" msgstr "Info" -#: events/templates/events/event_detail.html:54 +#: src/events/templates/events/event_detail.html:54 msgid "Mai-Star Games" msgstr "Mai-Star Spiele" -#: events/templates/events/event_detail.html:57 +#: src/events/templates/events/event_detail.html:57 msgid "Event Ranking" msgstr "Veranstaltungs Wertung" -#: events/templates/events/event_detail.html:100 +#: src/events/templates/events/event_detail.html:100 msgid "Share on Facebook" msgstr "Auf Facebook teilen" -#: events/templates/events/event_detail.html:104 +#: src/events/templates/events/event_detail.html:104 msgid "Share on Google+" msgstr "Auf Google+ teilen" -#: events/templates/events/event_detail.html:109 +#: src/events/templates/events/event_detail.html:109 msgid "Share on Twitter" msgstr "Auf Twitter teilen" -#: events/templates/events/event_detail.html:113 +#: src/events/templates/events/event_detail.html:113 msgid "Show on Google Maps" msgstr "Auf Google Maps zeigen" -#: events/templates/events/event_detail.html:127 -#: events/templates/events/event_form.html:9 events/views.py:104 +#: src/events/templates/events/event_detail.html:127 +#: src/events/templates/events/event_form.html:9 src/events/views.py:62 msgid "Edit Event" msgstr "Termin bearbeiten" -#: events/templates/events/event_detail.html:131 +#: src/events/templates/events/event_detail.html:131 msgid "Add Dates" msgstr "Termine hinzufügen" -#: events/templates/events/event_form.html:9 -#: events/templates/events/page.html:9 events/views.py:106 +#: src/events/templates/events/event_form.html:9 +#: src/events/templates/events/page.html:9 src/events/views.py:64 msgid "Add Event" msgstr "Neuer Termin" -#: events/templates/events/event_form.html:18 -#: events/templates/events/photo_list.html:35 +#: src/events/templates/events/event_form.html:18 +#: src/events/templates/events/photo_list.html:35 msgid "reset" msgstr "Zurücksetzen" -#: events/templates/events/event_form.html:19 -#: events/templates/events/eventseries_form.html:25 +#: src/events/templates/events/event_form.html:19 +#: src/events/templates/events/eventseries_form.html:25 msgid "save" msgstr "Speichern" -#: events/templates/events/event_list.html:4 -#: events/templates/events/event_list.html:5 +#: src/events/templates/events/event_list.html:4 +#: src/events/templates/events/event_list.html:5 msgid "Upcoming Events" msgstr "Bevorstehende Veranstaltungen" -#: events/templates/events/eventseries_form.html:24 +#: src/events/templates/events/eventseries_form.html:24 msgid "back" msgstr "Zurück" -#: events/templates/events/photo_confirm_delete.html:17 +#: src/events/templates/events/photo_confirm_delete.html:17 msgid "Cancel" msgstr "Abbrechen" -#: events/templates/events/photo_confirm_delete.html:21 -#: events/templates/events/photo_list.html:21 +#: src/events/templates/events/photo_confirm_delete.html:21 +#: src/events/templates/events/photo_list.html:21 msgid "Delete" msgstr "Löschen" -#: events/templates/events/photo_detail.html:44 +#: src/events/templates/events/photo_detail.html:44 msgid "previous" msgstr "Zurück" -#: events/templates/events/photo_detail.html:52 +#: src/events/templates/events/photo_detail.html:52 msgid "Photographer" msgstr "Fotograf" -#: events/templates/events/photo_detail.html:58 +#: src/events/templates/events/photo_detail.html:58 msgid "share on" msgstr "Teile auf" -#: events/templates/events/photo_detail.html:81 +#: src/events/templates/events/photo_detail.html:81 msgid "download" msgstr "Herunterladen" -#: events/templates/events/photo_detail.html:82 +#: src/events/templates/events/photo_detail.html:82 msgid "Rotate counter clockwise" msgstr "mit dem Uhrzeiger drehen" -#: events/templates/events/photo_detail.html:83 +#: src/events/templates/events/photo_detail.html:83 msgid "Rotate clockwise" msgstr "gegen den Uhrzeiger drehen" -#: events/templates/events/photo_detail.html:84 +#: src/events/templates/events/photo_detail.html:84 msgid "Save" msgstr "Speichern" -#: events/templates/events/photo_list.html:36 -#: events/templates/events/photo_upload.html:35 -#: events/templates/events/photo_upload.html:49 +#: src/events/templates/events/photo_list.html:36 +#: src/events/templates/events/photo_upload.html:35 +#: src/events/templates/events/photo_upload.html:49 msgid "Upload" msgstr "Hochladen" -#: events/views.py:203 +#: src/events/views.py:149 msgid "Event does not exist" msgstr "Veranstaltung gibt es nicht" diff --git a/src/events/templates/events/event_list.html b/src/events/templates/events/event_list.html index a685789..619feda 100755 --- a/src/events/templates/events/event_list.html +++ b/src/events/templates/events/event_list.html @@ -41,5 +41,4 @@ {% if forloop.counter|divisibleby:2 %}
{% endif %} {% endfor %} {% endfor %} -{% if page_obj.has_other_pages %}{% include 'paginator.html' %}{% endif %} {% endblock %} diff --git a/src/kasu/locale/de/LC_MESSAGES/django.po b/src/kasu/locale/de/LC_MESSAGES/django.po index b690e50..9f2c8dd 100644 --- a/src/kasu/locale/de/LC_MESSAGES/django.po +++ b/src/kasu/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kasu.utils\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-19 22:46+0200\n" +"POT-Creation-Date: 2018-01-11 22:50+0100\n" "PO-Revision-Date: 2016-09-28 00:24+0200\n" "Last-Translator: Christian Berg \n" "Language-Team: Kasu \n" @@ -19,174 +19,175 @@ msgstr "" "X-Generator: Poedit 1.8.9\n" "X-Translated-Using: django-rosetta 0.7.6\n" -#: kasu/settings.py:153 +#: src/kasu/settings.py:158 msgid "German" msgstr "Deutsch" -#: kasu/settings.py:153 +#: src/kasu/settings.py:158 msgid "English" msgstr "Englisch" -#: kasu/templates/404.html:8 +#: src/kasu/templates/404.html:8 msgid "The page your requested does not exist on this server." msgstr "Die angeforderte Seite existiert auf diesem Server nicht." -#: kasu/templates/base.html:22 +#: src/kasu/templates/base.html:22 msgid "Current News" msgstr "Aktuelle Neuigkeiten" -#: kasu/templates/base.html:24 kasu/templates/index.html:40 +#: src/kasu/templates/base.html:24 src/kasu/templates/index.html:40 msgid "Recent Comments" msgstr "Kürzliche Kommentare" -#: kasu/templates/base.html:45 +#: src/kasu/templates/base.html:45 msgid "Menu" msgstr "Menü" -#: kasu/templates/base.html:69 +#: src/kasu/templates/base.html:69 msgid "Current Event" msgstr "Aktuelle Veranstaltung" -#: kasu/templates/base.html:72 +#: src/kasu/templates/base.html:72 msgid "Since" msgstr "seit" -#: kasu/templates/base.html:73 kasu/templates/base.html:85 +#: src/kasu/templates/base.html:73 src/kasu/templates/base.html:85 msgid "Start" msgstr "Beginn" -#: kasu/templates/base.html:76 kasu/templates/base.html:88 +#: src/kasu/templates/base.html:76 src/kasu/templates/base.html:88 msgid "Location" msgstr "Ort" -#: kasu/templates/base.html:79 kasu/templates/base.html:90 +#: src/kasu/templates/base.html:79 src/kasu/templates/base.html:90 msgid "More Details" msgstr "Mehr Details" -#: kasu/templates/base.html:81 +#: src/kasu/templates/base.html:81 msgid "Next Event" msgstr "Nächste Veranstaltung" -#: kasu/templates/base.html:84 +#: src/kasu/templates/base.html:84 msgid "in" msgstr "in" -#: kasu/templates/base.html:93 +#: src/kasu/templates/base.html:93 msgid "Upcoming events" msgstr "Bevorstehende Veranstaltungen" -#: kasu/templates/base.html:143 +#: src/kasu/templates/base.html:143 msgid "Add Subpage" msgstr "Unterseite Hinzufügen" -#: kasu/templates/base.html:148 +#: src/kasu/templates/base.html:148 msgid "Edit Page" msgstr "Seite bearbeiten" -#: kasu/templates/base.html:156 +#: src/kasu/templates/base.html:156 msgid "Imprint" msgstr "Impressum" -#: kasu/templates/base.html:157 +#: src/kasu/templates/base.html:157 msgid "contact" msgstr "Kontakt" -#: kasu/templates/base.html:162 +#: src/kasu/templates/base.html:162 msgid "Language" msgstr "Sprache" -#: kasu/templates/base.html:171 +#: src/kasu/templates/base.html:171 msgid "Go" msgstr "Los" -#: kasu/templates/base.html:176 +#: src/kasu/templates/base.html:176 msgid "Logged in as" msgstr "Angemeldet als" -#: kasu/templates/base.html:178 +#: src/kasu/templates/base.html:178 msgid "Admin" msgstr "Admin" -#: kasu/templates/base.html:179 +#: src/kasu/templates/base.html:179 msgid "Logout" msgstr "Abmelden" -#: kasu/templates/base.html:181 +#: src/kasu/templates/base.html:181 msgid "no user logged in" msgstr "Niemand angemeldet" -#: kasu/templates/base.html:182 kasu/templates/comments/form.html:43 +#: src/kasu/templates/base.html:182 src/kasu/templates/comments/form.html:43 msgid "register" msgstr "Registrieren" -#: kasu/templates/base.html:183 kasu/templates/comments/form.html:44 +#: src/kasu/templates/base.html:183 src/kasu/templates/comments/form.html:44 msgid "login" msgstr "anmelden" -#: kasu/templates/base.html:185 +#: src/kasu/templates/base.html:185 msgid "Login with Facebook" msgstr "über Facebook anmelden" -#: kasu/templates/base.html:187 +#: src/kasu/templates/base.html:187 msgid "Login with Twitter" msgstr "über Twitter anmelden" -#: kasu/templates/base.html:189 +#: src/kasu/templates/base.html:189 msgid "Login with Google" msgstr "über Google anmelden" -#: kasu/templates/comments/form.html:5 +#: src/kasu/templates/comments/form.html:5 msgid "New Comment" msgstr "Neuer Kommentar" -#: kasu/templates/comments/form.html:20 +#: src/kasu/templates/comments/form.html:20 msgid "now" msgstr "Jetzt" -#: kasu/templates/comments/form.html:25 +#: src/kasu/templates/comments/form.html:25 msgid "Preview" msgstr "Vorschau" -#: kasu/templates/comments/form.html:26 +#: src/kasu/templates/comments/form.html:26 msgid "Post" msgstr "Schreiben" -#: kasu/templates/comments/form.html:34 +#: src/kasu/templates/comments/form.html:34 msgid "not logged in" msgstr "Nicht angemeldet" -#: kasu/templates/comments/form.html:38 +#: src/kasu/templates/comments/form.html:38 msgid "Register now, or Login to leave a comment here." msgstr "Jetzt registrieren, oder anmelden um einen Kommentar zu schreiben." -#: kasu/templates/comments/list.html:2 kasu/templates/index.html:25 +#: src/kasu/templates/comments/list.html:2 src/kasu/templates/index.html:25 msgid "Comments" msgstr "Kommentare" -#: kasu/templates/comments/posted.html:4 kasu/templates/comments/posted.html:7 +#: src/kasu/templates/comments/posted.html:4 +#: src/kasu/templates/comments/posted.html:7 msgid "Thank you for your comment" msgstr "Danke für deinen Kommentar." -#: kasu/templates/comments/preview.html:4 -#: kasu/templates/comments/preview.html:6 +#: src/kasu/templates/comments/preview.html:4 +#: src/kasu/templates/comments/preview.html:6 msgid "Preview your comment" msgstr "Vorschau deines Kommentars" -#: kasu/templates/comments/preview.html:10 +#: src/kasu/templates/comments/preview.html:10 msgid "Please correct the error below" msgid_plural "Please correct the errors below" msgstr[0] "Bitte den Fehler weiter unten beheben" msgstr[1] "Bitte die Fehler weiter unten beheben" -#: kasu/templates/index.html:4 +#: src/kasu/templates/index.html:4 msgid "traditional Asian game culture" msgstr "traditionelle asiatische Spielkultur" -#: kasu/templates/index.html:33 +#: src/kasu/templates/index.html:33 msgid "Read More" msgstr "Mehr lesen" -#: kasu/templates/index.html:47 +#: src/kasu/templates/index.html:47 #, python-format msgid "" "\n" @@ -203,23 +204,23 @@ msgstr "" " \n" " " -#: kasu/templates/index.html:59 +#: src/kasu/templates/index.html:59 msgid "Kasu in the social network" msgstr "Kasu im sozialem Netzwerk" -#: kasu/templates/index.html:62 kasu/templates/index.html:65 +#: src/kasu/templates/index.html:62 src/kasu/templates/index.html:65 msgid "Visit us on" msgstr "Besuche uns auf" -#: kasu/templates/index.html:74 +#: src/kasu/templates/index.html:74 msgid "Add Article" msgstr "Artikel hinzufügen" -#: kasu/templates/paginator.html:8 +#: src/kasu/templates/paginator.html:8 msgid "Previous" msgstr "Vorherige" -#: kasu/templates/paginator.html:20 +#: src/kasu/templates/paginator.html:20 msgid "Next" msgstr "Nächste" diff --git a/src/kasu/static/css/kasu.css b/src/kasu/static/css/kasu.css index b889b3e..7c33e26 100644 --- a/src/kasu/static/css/kasu.css +++ b/src/kasu/static/css/kasu.css @@ -337,6 +337,10 @@ ul.tabs li.active a { ul.errorlist li { color: #a40000; } +input.error { + border-color: #a40000; + background-color: rgba(164, 0, 0, 0.25); +} .game h2 { margin: 0.5em 0; } diff --git a/src/kasu/static/js/jquery.formset.js b/src/kasu/static/js/jquery.formset.js new file mode 100644 index 0000000..d910758 --- /dev/null +++ b/src/kasu/static/js/jquery.formset.js @@ -0,0 +1,231 @@ +/** + * jQuery Formset 1.3-pre + * @author Stanislaus Madueke (stan DOT madueke AT gmail DOT com) + * @requires jQuery 1.2.6 or later + * + * Copyright (c) 2009, Stanislaus Madueke + * All rights reserved. + * + * Licensed under the New BSD License + * See: http://www.opensource.org/licenses/bsd-license.php + */ +;(function($) { + $.fn.formset = function(opts) + { + var options = $.extend({}, $.fn.formset.defaults, opts), + flatExtraClasses = options.extraClasses.join(' '), + totalForms = $('#id_' + options.prefix + '-TOTAL_FORMS'), + maxForms = $('#id_' + options.prefix + '-MAX_NUM_FORMS'), + minForms = $('#id_' + options.prefix + '-MIN_NUM_FORMS'), + childElementSelector = 'input,select,textarea,label,div', + $$ = $(this), + + applyExtraClasses = function(row, ndx) { + if (options.extraClasses) { + row.removeClass(flatExtraClasses); + row.addClass(options.extraClasses[ndx % options.extraClasses.length]); + } + }, + + updateElementIndex = function(elem, prefix, ndx) { + var idRegex = new RegExp(prefix + '-(\\d+|__prefix__)-'), + replacement = prefix + '-' + ndx + '-'; + if (elem.attr("for")) elem.attr("for", elem.attr("for").replace(idRegex, replacement)); + if (elem.attr('id')) elem.attr('id', elem.attr('id').replace(idRegex, replacement)); + if (elem.attr('name')) elem.attr('name', elem.attr('name').replace(idRegex, replacement)); + }, + + hasChildElements = function(row) { + return row.find(childElementSelector).length > 0; + }, + + showAddButton = function() { + return maxForms.length == 0 || // For Django versions pre 1.2 + (maxForms.val() == '' || (maxForms.val() - totalForms.val() > 0)); + }, + + /** + * Indicates whether delete link(s) can be displayed - when total forms > min forms + */ + showDeleteLinks = function() { + return minForms.length == 0 || // For Django versions pre 1.7 + (minForms.val() == '' || (totalForms.val() - minForms.val() > 0)); + }, + + insertDeleteLink = function(row) { + var delCssSelector = $.trim(options.deleteCssClass).replace(/\s+/g, '.'), + addCssSelector = $.trim(options.addCssClass).replace(/\s+/g, '.'); + if (row.is('TR')) { + // If the forms are laid out in table rows, insert + // the remove button into the last table cell: + row.children(':last').append('' + options.deleteText + ''); + } else if (row.is('UL') || row.is('OL')) { + // If they're laid out as an ordered/unordered list, + // insert an
  • after the last list item: + row.append('
  • ' + options.deleteText +'
    • '); + } else { + // Otherwise, just insert the remove button as the + // last child element of the form's container: + row.append('' + options.deleteText +''); + } + // Check if we're under the minimum number of forms - not to display delete link at rendering + if (!showDeleteLinks()){ + row.find('a.' + delCssSelector).hide(); + } + + row.find('a.' + delCssSelector).click(function() { + var row = $(this).parents('.' + options.formCssClass), + del = row.find('input:hidden[id $= "-DELETE"]'), + buttonRow = row.siblings("a." + addCssSelector + ', .' + options.formCssClass + '-add'), + forms; + if (del.length) { + // We're dealing with an inline formset. + // Rather than remove this form from the DOM, we'll mark it as deleted + // and hide it, then let Django handle the deleting: + del.val('on'); + row.hide(); + forms = $('.' + options.formCssClass).not(':hidden'); + } else { + row.remove(); + // Update the TOTAL_FORMS count: + forms = $('.' + options.formCssClass).not('.formset-custom-template'); + totalForms.val(forms.length); + } + for (var i=0, formCount=forms.length; i