From 3e1a655d0981c007815029c872d22637a018a7f0 Mon Sep 17 00:00:00 2001 From: LEdoian Date: Sat, 24 Mar 2018 12:34:32 +0100 Subject: [PATCH] =?UTF-8?q?Na=20r=C5=AFzn=C3=BDch=20m=C3=ADstech=20zm?= =?UTF-8?q?=C4=9Bna=20odd=C4=9Blen=C3=AD=20(OVVP=20->=20OPMK)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- obalky/obalky-template.tex | 2 +- seminar/management/commands/importschools.py | 4 +++- seminar/models.py | 2 +- seminar/static/seminar/stvrzenka.sty | 2 +- seminar/templates/seminar/archiv/obalky.tex | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/obalky/obalky-template.tex b/obalky/obalky-template.tex index c7490f1b..db2b7c3c 100644 --- a/obalky/obalky-template.tex +++ b/obalky/obalky-template.tex @@ -47,7 +47,7 @@ \parindent=\fromskip \line{\indent\adrfonta Časopis M\&M,\hfil} \vskip3pt -\line{\indent\adrfontb OVVP UK MFF\hfil} +\line{\indent\adrfontb OPMK UK MFF\hfil} \vskip3pt \line{\indent\adrfontc Ke Karlovu 3, 121 16 Praha 2\hfil} \line{\indent\adrfontc Tel.: +420 221 911 235\hss} diff --git a/seminar/management/commands/importschools.py b/seminar/management/commands/importschools.py index 08c0f4eb..ef761179 100644 --- a/seminar/management/commands/importschools.py +++ b/seminar/management/commands/importschools.py @@ -52,7 +52,9 @@ class Command(BaseCommand): assert len(args) == 1 filename = args[0] - self.stdout.write('Parsing OVVP-format file \'%s\' ...' % (filename, )) + self.stdout.write( + 'Parsing OVVP/OPMK-format file \'%s\' ...' % (filename, ) + ) with open(filename, "r") as f: o = ovvpfile.parse(f) diff --git a/seminar/models.py b/seminar/models.py index ad94324c..9b570a49 100644 --- a/seminar/models.py +++ b/seminar/models.py @@ -194,7 +194,7 @@ class Resitel(SeminarModelBase): return force_unicode(self.plne_jmeno()) def export_row(self): - "Slovnik pro pouziti v OVVP exportu" + "Slovnik pro pouziti v OVVP (OPMK) exportu" return { 'id': self.id, 'name': self.jmeno, diff --git a/seminar/static/seminar/stvrzenka.sty b/seminar/static/seminar/stvrzenka.sty index aa3122a1..cedbc4f4 100644 --- a/seminar/static/seminar/stvrzenka.sty +++ b/seminar/static/seminar/stvrzenka.sty @@ -6,7 +6,7 @@ {Univerzita Karlova \\ \indent Matematicko-fyzikální fakulta \\ - \indent OVVP, M\&M \\ + \indent OPMK, M\&M \\ \indent Ke Karlovu 3, 120 00 Praha 2 \\ \indent IČ: 00216208 DIČ: CZ00216208} diff --git a/seminar/templates/seminar/archiv/obalky.tex b/seminar/templates/seminar/archiv/obalky.tex index 7a6795ff..72c4ab04 100644 --- a/seminar/templates/seminar/archiv/obalky.tex +++ b/seminar/templates/seminar/archiv/obalky.tex @@ -50,7 +50,7 @@ \parindent=\fromskip \line{\indent\adrfonta Časopis M\&M,\hfil} \vskip3pt -\line{\indent\adrfontb OVVP UK MFF\hfil} +\line{\indent\adrfontb OPMK UK MFF\hfil} \vskip3pt \line{\indent\adrfontc Ke Karlovu 3, 121 16 Praha 2\hfil} \line{\indent\adrfontc Tel.: +420 221 911 235\hss}