Added English version of accommodation document. Added translations. Fixed bug on adding camp to voucher.

9 years ago · a33992b9b9
parent cc6111d09f
commit a33992b9b9
10 changed files with 3142 additions and 198 deletions
--- a/camp/camp.json
+++ b/camp/camp.json
@ -114,6 +114,6 @@ ALTER TABLE AddressItem ADD \"totalPrice\" INTEGER NULL;

    "reports" : [
        { "name" : "Doklad", "description" : "Doklad k ubytování", "listReport" : false, "file" : "camp_accommodation_document.lrxml" },
-        { "name" : "Doklad jedna strana anglicky", "description" : "Doklad k ubytování jedna strana anglicky", "listReport" : false, "file" : "camp_accommodation_document.lrxml" }
+        { "name" : "Doklad jedna strana anglicky", "description" : "Doklad k ubytování jedna strana anglicky", "listReport" : false, "file" : "camp_accommodation_document_en.lrxml" }
    ]
 }
--- a/camp/campwizard.cpp
+++ b/camp/campwizard.cpp
@ -103,6 +103,7 @@ CampWizard::CampWizard(QWidget *parent) :
    ui->setupUi(this);

    m_peopleModel = new AutoTableModel<AddressItem>(this);
+    m_peopleModel->setTranslations(Context::instance().plugin("CAMP")->translations());
    ui->tablePeople->setModel(m_peopleModel);
    ui->tablePeople->hideColumn(2);
    ui->tablePeople->hideColumn(3);
@ -151,6 +152,7 @@ CampWizard::CampWizard(QWidget *parent) :

    Service<AccService> serviceSrv;
    m_servicesModel = new AutoTableModel<AccService>(this);
+    m_servicesModel->setTranslations(Context::instance().plugin("CAMP")->translations());
    m_servicesModel->setData(serviceSrv.all());
    ui->tableServices->setModel(m_servicesModel);

@ -163,6 +165,7 @@ CampWizard::CampWizard(QWidget *parent) :
    ui->tableServices->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);

    m_itemsModel = new AutoTableModel<ServiceItem>();
+    m_itemsModel->setTranslations(Context::instance().plugin("CAMP")->translations());
    ui->tableItems->setModel(m_itemsModel);

    ui->tableItems->hideColumn(1);
@ -423,7 +426,7 @@ void CampWizard::accept()
        success = false;
    });

-    if (m_newRecord)
+    if (m_newRecord && m_data->id() == 0)
    {
        srv.saveCamp(m_data);
    }
--- a/camp/detailwidget.cpp
+++ b/camp/detailwidget.cpp
@ -11,6 +11,10 @@ DetailWidget::DetailWidget(QWidget *parent) :

    m_peopleModel = new AutoTableModel<AddressItem>(this);
    m_servicesModel = new AutoTableModel<ServiceItem>(this);
+
+    m_peopleModel->setTranslations(Context::instance().plugin("CAMP")->translations());
+    m_servicesModel->setTranslations(Context::instance().plugin("CAMP")->translations());
+
    ui->tabPeople->setModel(m_peopleModel);
    ui->tabServices->setModel(m_servicesModel);

--- a/camp/translations/camp_cs_CZ.qm
+++ b/camp/translations/camp_cs_CZ.qm
--- a/camp/translations/camp_cs_CZ.ts
+++ b/camp/translations/camp_cs_CZ.ts
@ -32,6 +32,44 @@
        <translation>Ubytování</translation>
    </message>
 </context>
+<context>
+    <name>CampGrid</name>
+    <message>
+        <location filename="../campgrid.cpp" line="22"/>
+        <source>Pay</source>
+        <translation>Zaplatit</translation>
+    </message>
+    <message>
+        <location filename="../campgrid.cpp" line="75"/>
+        <source>Can not edit</source>
+        <translation>Nemohu upravit</translation>
+    </message>
+    <message>
+        <location filename="../campgrid.cpp" line="75"/>
+        <source>This record is asociated with voucher. Can not edit paid items</source>
+        <translation>Tento záznam je na účtence. Nemohu změnit položky</translation>
+    </message>
+    <message>
+        <location filename="../campgrid.cpp" line="97"/>
+        <source>Can not delete</source>
+        <translation>Nemohu smazat</translation>
+    </message>
+    <message>
+        <location filename="../campgrid.cpp" line="97"/>
+        <source>This record is asociated with voucher. Can not delete paid items</source>
+        <translation>Tento záznam je na účtence. Nemohu smazat položky</translation>
+    </message>
+    <message>
+        <location filename="../campgrid.cpp" line="109"/>
+        <source>Can not pay</source>
+        <translation>Nemohu zaplatit</translation>
+    </message>
+    <message>
+        <location filename="../campgrid.cpp" line="109"/>
+        <source>This record is already paid</source>
+        <translation>Tato položka je již zaplacena</translation>
+    </message>
+</context>
 <context>
    <name>CampSettingsForm</name>
    <message>
@ -255,122 +293,174 @@
        <translation>Stát</translation>
    </message>
    <message>
-        <location filename="../campwizard.ui" line="327"/>
+        <location filename="../campwizard.ui" line="333"/>
        <source>Remove</source>
        <translation>Odebrat</translation>
    </message>
    <message>
-        <location filename="../campwizard.ui" line="330"/>
-        <location filename="../campwizard.ui" line="356"/>
-        <location filename="../campwizard.ui" line="449"/>
-        <location filename="../campwizard.ui" line="472"/>
+        <location filename="../campwizard.ui" line="336"/>
+        <location filename="../campwizard.ui" line="362"/>
+        <location filename="../campwizard.ui" line="462"/>
+        <location filename="../campwizard.ui" line="485"/>
        <source>...</source>
        <translation>...</translation>
    </message>
    <message>
-        <location filename="../campwizard.ui" line="353"/>
+        <location filename="../campwizard.ui" line="359"/>
        <source>Owner</source>
        <translation>Vlastník</translation>
    </message>
    <message>
-        <location filename="../campwizard.ui" line="421"/>
+        <location filename="../campwizard.ui" line="427"/>
        <source>Services</source>
        <translation>Služby</translation>
    </message>
    <message>
-        <location filename="../campwizard.ui" line="514"/>
+        <location filename="../campwizard.ui" line="534"/>
        <source>Sale</source>
        <translation>Sleva</translation>
    </message>
    <message>
-        <location filename="../campwizard.ui" line="520"/>
+        <location filename="../campwizard.cpp" line="377"/>
        <source>Apply sale</source>
        <translation>Uplatnit slevu</translation>
    </message>
    <message>
-        <location filename="../campwizard.ui" line="541"/>
+        <location filename="../campwizard.ui" line="609"/>
        <source>Summary</source>
        <translation>Shrnutí</translation>
    </message>
    <message>
-        <location filename="../campwizard.ui" line="559"/>
+        <location filename="../campwizard.ui" line="627"/>
        <source>From:</source>
        <translation>Od:</translation>
    </message>
    <message>
-        <location filename="../campwizard.ui" line="566"/>
-        <location filename="../campwizard.ui" line="580"/>
-        <location filename="../campwizard.ui" line="622"/>
-        <location filename="../campwizard.ui" line="664"/>
+        <location filename="../campwizard.ui" line="579"/>
+        <location filename="../campwizard.ui" line="634"/>
+        <location filename="../campwizard.ui" line="648"/>
+        <location filename="../campwizard.ui" line="690"/>
+        <location filename="../campwizard.ui" line="732"/>
        <source>TextLabel</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../campwizard.ui" line="573"/>
+        <location filename="../campwizard.ui" line="540"/>
+        <location filename="../campwizard.cpp" line="382"/>
+        <source>Change</source>
+        <translation>Změnit</translation>
+    </message>
+    <message>
+        <location filename="../campwizard.ui" line="641"/>
        <source>To:</source>
        <translation>Do:</translation>
    </message>
    <message>
-        <location filename="../campwizard.ui" line="615"/>
+        <location filename="../campwizard.ui" line="683"/>
        <source>Days:</source>
        <translation>Počet dní:</translation>
    </message>
    <message>
-        <location filename="../campwizard.ui" line="657"/>
+        <location filename="../campwizard.ui" line="725"/>
        <source>Owner:</source>
        <translation>Vlastník:</translation>
    </message>
    <message>
-        <location filename="../campwizard.ui" line="687"/>
+        <location filename="../campwizard.ui" line="755"/>
        <source>People:</source>
        <translation>Ubytovaní:</translation>
    </message>
    <message>
-        <location filename="../campwizard.ui" line="697"/>
+        <location filename="../campwizard.ui" line="765"/>
        <source>Services:</source>
        <translation>Služby:</translation>
    </message>
    <message>
-        <location filename="../campwizard.ui" line="710"/>
+        <location filename="../campwizard.ui" line="778"/>
        <source>Sale:</source>
        <translation>Sleva:</translation>
    </message>
    <message>
-        <location filename="../campwizard.ui" line="723"/>
+        <location filename="../campwizard.ui" line="791"/>
        <source>Total:</source>
        <translation>Celkem:</translation>
    </message>
    <message>
-        <location filename="../campwizard.ui" line="780"/>
+        <location filename="../campwizard.ui" line="848"/>
        <source>Print</source>
        <translation>Tisk</translation>
    </message>
    <message>
-        <location filename="../campwizard.cpp" line="366"/>
-        <location filename="../campwizard.cpp" line="372"/>
-        <location filename="../campwizard.cpp" line="378"/>
+        <location filename="../campwizard.cpp" line="224"/>
+        <source>Fixed amound</source>
+        <translation>Pevná částka</translation>
+    </message>
+    <message>
+        <location filename="../campwizard.cpp" line="224"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../campwizard.cpp" line="392"/>
+        <location filename="../campwizard.cpp" line="398"/>
+        <location filename="../campwizard.cpp" line="404"/>
        <source>Error</source>
        <translation>Chyba</translation>
    </message>
    <message>
-        <location filename="../campwizard.cpp" line="366"/>
+        <location filename="../campwizard.cpp" line="392"/>
        <source>Add people.</source>
        <translation>Přidání lidí.</translation>
    </message>
    <message>
-        <location filename="../campwizard.cpp" line="372"/>
+        <location filename="../campwizard.cpp" line="398"/>
        <source>Start date is after or equals end date.</source>
        <translation>Datum začátku je stejné nebo menší než datum konce.</translation>
    </message>
    <message>
-        <location filename="../campwizard.cpp" line="378"/>
+        <location filename="../campwizard.cpp" line="404"/>
        <source>Add service.</source>
        <translation>Přidat službu.</translation>
    </message>
    <message>
-        <location filename="../campwizard.cpp" line="392"/>
+        <location filename="../campwizard.cpp" line="417"/>
+        <location filename="../campwizard.cpp" line="452"/>
        <source>Database error</source>
        <translation>Chyba databáze</translation>
    </message>
+    <message>
+        <location filename="../campwizard.cpp" line="422"/>
+        <location filename="../campwizard.cpp" line="457"/>
+        <source>Permission denied</source>
+        <translation>Nedostatečná oprávnění</translation>
+    </message>
+    <message>
+        <location filename="../campwizard.cpp" line="443"/>
+        <source>Save record?</source>
+        <translation>Uložit záznam?</translation>
+    </message>
+    <message>
+        <location filename="../campwizard.cpp" line="443"/>
+        <source>Record must be saved before print. Do you want to save record?</source>
+        <translation>Záznam musí být před tiskem uložen. Chcete jej uložit?</translation>
+    </message>
+</context>
+<context>
+    <name>DetailWidget</name>
+    <message>
+        <location filename="../detailwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Detail ubytování</translation>
+    </message>
+    <message>
+        <location filename="../detailwidget.ui" line="20"/>
+        <source>People</source>
+        <translation>Ubytovaný</translation>
+    </message>
+    <message>
+        <location filename="../detailwidget.ui" line="39"/>
+        <source>Services</source>
+        <translation>Služby</translation>
+    </message>
 </context>
 </TS>
--- a/core/translations/core_cs_CZ.ts
+++ b/core/translations/core_cs_CZ.ts
@ -563,46 +563,46 @@
    <name>T</name>
    <message>
        <location filename="../autoform.h" line="41"/>
-        <location filename="../gridform.h" line="152"/>
-        <location filename="../gridform.h" line="155"/>
+        <location filename="../gridform.h" line="156"/>
+        <location filename="../gridform.h" line="159"/>
        <source>Database error</source>
        <translation>Chyba databáze</translation>
    </message>
    <message>
        <location filename="../autoform.h" line="46"/>
-        <location filename="../gridform.h" line="180"/>
-        <location filename="../gridform.h" line="200"/>
-        <location filename="../gridform.h" line="220"/>
+        <location filename="../gridform.h" line="250"/>
+        <location filename="../gridform.h" line="262"/>
+        <location filename="../gridform.h" line="274"/>
        <source>Permission denied</source>
        <translation>Nedostatečná oprávnění</translation>
    </message>
    <message>
-        <location filename="../gridform.h" line="180"/>
+        <location filename="../gridform.h" line="250"/>
        <source>You don&apos;t have permission to add new record.</source>
        <translation>Nemáte oprávnění přidat nový záznam.</translation>
    </message>
    <message>
-        <location filename="../gridform.h" line="200"/>
+        <location filename="../gridform.h" line="262"/>
        <source>You don&apos;t have permission to edit record.</source>
        <translation>Nemáte oprávnění upravit záznam.</translation>
    </message>
    <message>
-        <location filename="../gridform.h" line="220"/>
+        <location filename="../gridform.h" line="274"/>
        <source>You don&apos;t have permission to delete record.</source>
        <translation>Nemáte oprávnění smazat záznam.</translation>
    </message>
    <message>
-        <location filename="../gridform.h" line="233"/>
+        <location filename="../gridform.h" line="231"/>
        <source>Delete record</source>
        <translation>Smazat záznam</translation>
    </message>
    <message>
-        <location filename="../gridform.h" line="233"/>
+        <location filename="../gridform.h" line="231"/>
        <source>Realy delete this record?</source>
        <translation>Opravdu si přejete smazat tento záznam?</translation>
    </message>
    <message>
-        <location filename="../gridform.h" line="273"/>
+        <location filename="../gridform.h" line="327"/>
        <source>Import</source>
        <translation>Import</translation>
    </message>
--- a/reports/camp_accommodation_document.lrxml
+++ b/reports/camp_accommodation_document.lrxml
--- a/reports/camp_accommodation_document_en.lrxml
+++ b/reports/camp_accommodation_document_en.lrxml
--- a/shop/translations/shop_cs_CZ.qm
+++ b/shop/translations/shop_cs_CZ.qm
--- a/shop/translations/shop_cs_CZ.ts
+++ b/shop/translations/shop_cs_CZ.ts
@ -167,6 +167,40 @@
        <translation>Chyba</translation>
    </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../shopform.cpp" line="35"/>
+        <source>EET communication error.
+</source>
+        <translation>Chyba komunikace s EET</translation>
+    </message>
+    <message>
+        <location filename="../shopform.cpp" line="39"/>
+        <source>Message from portal: </source>
+        <translation>Zpráva z EET portálu:</translation>
+    </message>
+    <message>
+        <location filename="../shopform.cpp" line="42"/>
+        <source>Switch to offline?</source>
+        <translation>Přepnout do offline?</translation>
+    </message>
+    <message>
+        <location filename="../shopform.cpp" line="44"/>
+        <source>EET error</source>
+        <translation>Chyba EET</translation>
+    </message>
+    <message>
+        <location filename="../shopform.cpp" line="50"/>
+        <source>&lt;a href=&quot;#eet&quot;&gt;Online&lt;/a&gt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../shopform.cpp" line="50"/>
+        <source>&lt;a href=&quot;#eet&quot;&gt;Offline&lt;/a&gt;</source>
+        <translation></translation>
+    </message>
+</context>
 <context>
    <name>ReceiptLoadForm</name>
    <message>
@ -325,44 +359,38 @@
        <translation>Zaplatit</translation>
    </message>
    <message>
-        <location filename="../shopform.cpp" line="93"/>
-        <location filename="../shopform.cpp" line="436"/>
-        <location filename="../shopform.cpp" line="505"/>
+        <location filename="../shopform.cpp" line="133"/>
+        <location filename="../shopform.cpp" line="539"/>
        <source>&lt;a href=&quot;#eet&quot;&gt;Online&lt;/a&gt;</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../shopform.cpp" line="93"/>
-        <location filename="../shopform.cpp" line="436"/>
-        <location filename="../shopform.cpp" line="505"/>
+        <location filename="../shopform.cpp" line="133"/>
+        <location filename="../shopform.cpp" line="539"/>
        <source>&lt;a href=&quot;#eet&quot;&gt;Offline&lt;/a&gt;</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../shopform.cpp" line="166"/>
+        <location filename="../shopform.cpp" line="206"/>
        <source>&lt;&lt; empty &gt;&gt;</source>
        <translation>&lt;&lt; nevybráno &gt;&gt;</translation>
    </message>
    <message>
-        <location filename="../shopform.cpp" line="424"/>
        <source>EET communication error.
 </source>
-        <translation>Chyba komunikace s EET</translation>
+        <translation type="vanished">Chyba komunikace s EET</translation>
    </message>
    <message>
-        <location filename="../shopform.cpp" line="428"/>
        <source>Message from portal: </source>
-        <translation>Zpráva z EET portálu:</translation>
+        <translation type="vanished">Zpráva z EET portálu:</translation>
    </message>
    <message>
-        <location filename="../shopform.cpp" line="431"/>
        <source>Switch to offline?</source>
-        <translation>Přepnout do offline?</translation>
+        <translation type="vanished">Přepnout do offline?</translation>
    </message>
    <message>
-        <location filename="../shopform.cpp" line="433"/>
        <source>EET error</source>
-        <translation>Chyba EET</translation>
+        <translation type="vanished">Chyba EET</translation>
    </message>
 </context>
 <context>