ITsolved/prodejna
2
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.bukova.info/repos/git/prodejna

Browse Source
This commit is contained in:
Josef Rokos
2016-05-29 18:35:25 +02:00
parent facaf98cf0 d10a832766
commit 8ed2e4d78a
23 changed files with 138 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/translations/prodejna_cs_CZ.qm
BIN
View File
Binary file not shown.
application/translations/prodejna_cz.ts
+4 -4
View File
@@ -30,23 +30,23 @@
<message>
<location filename="../mainwindow.ui" line="86"/>
<source>Exit</source>
<translation type="unfinished"></translation>
<translation>Konec</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="91"/>
<source>Open database...</source>
<translation type="unfinished"></translation>
<translation>Otevřít databázi...</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="100"/>
<source>Login...</source>
<translation type="unfinished"></translation>
<translation>Přihlásit se...</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="109"/>
<location filename="../mainwindow.ui" line="112"/>
<source>Settings</source>
<translation type="unfinished"></translation>
<translation>Nastavení</translation>
</message>
</context>
</TS>
commodity/commodity.cpp
+5
View File
@@ -23,3 +23,8 @@ QIcon Commodity::pluginIcon()
{
return QIcon(":/icons/commodityPlugin.svg");
}
QTranslator *Commodity::translator()
{
return translatorFrom(":/translations/commodity_");
}
commodity/commodity.h
+1
View File
@@ -22,6 +22,7 @@ protected:
// IPlugin interface
public:
virtual QIcon pluginIcon();
QTranslator *translator();
};
commodity/commodity.json
+12 -1
View File
@@ -29,5 +29,16 @@ CREATE TABLE \"CommodityData\" (
DEFERRABLE INITIALLY DEFERRED);"
],
"dependencies" : []
"dependencies" : [],
"translations" : {
"CZ" : {
"name" : "Název",
"shortName" : "Zobrazit na účtence",
"code" : "Kód",
"type" : "Druh",
"price" : "Cena",
"vat" : "DPH",
"count" : "Počet"
}
}
}
commodity/commodity.pro
+1
View File
@@ -72,3 +72,4 @@ FORMS += \
RESOURCES += \
commodityrc.qrc
TRANSLATIONS = translations/commodity_cs_CZ.ts
commodity/commodityrc.qrc
+1
View File
@@ -1,5 +1,6 @@
<RCC>
<qresource prefix="/">
<file>icons/commodityPlugin.svg</file>
<file>translations/commodity_cs_CZ.qm</file>
</qresource>
</RCC>
commodity/translations/commodity_cs_CZ.qm
BIN
View File
Binary file not shown.
core/context.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ void Context::loadPlugins()
m_plugins.append(new Users);
m_plugins.append(new Roles);
QDir pluginsDir(qApp->applicationDirPath() + "/../../plugins");
QDir pluginsDir(qApp->applicationDirPath() + "/../plugins");
foreach (QString fileName, pluginsDir.entryList(QStringList() << "*.so" << "*.dll")) {
QPluginLoader pluginLoader(pluginsDir.absoluteFilePath(fileName));
core/translations/core_cs_CZ.qm
BIN
View File
Binary file not shown.
core/translations/core_cs_CZ.ts
+59 -26
View File
@@ -1,6 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="cs_CZ">
<context>
<name>AutoForm</name>
<message>
<location filename="../autoform.h" line="41"/>
<source>Database error</source>
<translation>Chyba databáze</translation>
</message>
<message>
<location filename="../autoform.h" line="46"/>
<source>Permission denied</source>
<translation>Nedostatečná oprávnění</translation>
</message>
</context>
<context>
<name>ColumnDialog</name>
<message>
@@ -97,7 +110,7 @@
<message>
<location filename="../formdialog.ui" line="64"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../formdialog.cpp" line="36"/>
@@ -118,58 +131,78 @@
<translation>Informace o společnosti</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="26"/>
<location filename="../settings/globalsettingsform.ui" line="29"/>
<source>IC</source>
<translation>IČO</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="36"/>
<location filename="../settings/globalsettingsform.ui" line="39"/>
<source>VAT number</source>
<translation>DIČ</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="46"/>
<location filename="../settings/globalsettingsform.ui" line="49"/>
<source>VAT payer</source>
<translation>Plátce DPH</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="56"/>
<location filename="../settings/globalsettingsform.ui" line="62"/>
<source>VAT rates</source>
<translation>Sazby DPH</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="68"/>
<source>High</source>
<translation>Vysoká</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="82"/>
<source>First lower</source>
<translation>První snížená</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="96"/>
<source>Second lower</source>
<translation>Druhá snížená</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="116"/>
<source>Contact</source>
<translation>Kontaktní údaje</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="62"/>
<location filename="../settings/globalsettingsform.ui" line="122"/>
<source>Firm Name</source>
<translation>Název společnosti</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="72"/>
<location filename="../settings/globalsettingsform.ui" line="132"/>
<source>Street</source>
<translation>Ulice</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="82"/>
<location filename="../settings/globalsettingsform.ui" line="142"/>
<source>House Number</source>
<translation>Číslo popisné</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="92"/>
<location filename="../settings/globalsettingsform.ui" line="152"/>
<source>City</source>
<translation>Město</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="102"/>
<location filename="../settings/globalsettingsform.ui" line="162"/>
<source>ZIP code</source>
<translation>PSČ</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="115"/>
<location filename="../settings/globalsettingsform.ui" line="121"/>
<location filename="../settings/globalsettingsform.ui" line="175"/>
<location filename="../settings/globalsettingsform.ui" line="181"/>
<source>Logo</source>
<translation>Logo</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="128"/>
<location filename="../settings/globalsettingsform.ui" line="188"/>
<source>Select file</source>
<translation>Vyber soubor</translation>
</message>
@@ -192,59 +225,59 @@
<translation></translation>
</message>
<message>
<location filename="../gridform.ui" line="52"/>
<location filename="../gridform.ui" line="55"/>
<source>Edit record</source>
<translation>Upravit záznam</translation>
</message>
<message>
<location filename="../gridform.ui" line="55"/>
<location filename="../gridform.ui" line="58"/>
<source>E</source>
<translation></translation>
</message>
<message>
<location filename="../gridform.ui" line="75"/>
<location filename="../gridform.h" line="188"/>
<location filename="../gridform.ui" line="81"/>
<location filename="../gridform.h" line="204"/>
<source>Delete record</source>
<translation>Smazat záznam</translation>
</message>
<message>
<location filename="../gridform.ui" line="78"/>
<location filename="../gridform.ui" line="84"/>
<source>D</source>
<translation></translation>
</message>
<message>
<location filename="../gridform.ui" line="98"/>
<location filename="../gridform.ui" line="104"/>
<source>Filter</source>
<translation>Filtr</translation>
</message>
<message>
<location filename="../gridform.ui" line="101"/>
<location filename="../gridform.ui" line="107"/>
<source>F</source>
<translation></translation>
</message>
<message>
<location filename="../gridform.ui" line="124"/>
<location filename="../gridform.ui" line="130"/>
<source>Print</source>
<translation>Tisk</translation>
</message>
<message>
<location filename="../gridform.ui" line="127"/>
<location filename="../gridform.ui" line="133"/>
<source>P</source>
<translation></translation>
</message>
<message>
<location filename="../gridform.ui" line="190"/>
<location filename="../gridform.ui" line="196"/>
<source>Select columns</source>
<translation>Vybrat sloupce</translation>
</message>
<message>
<location filename="../gridform.h" line="138"/>
<location filename="../gridform.h" line="141"/>
<location filename="../gridform.h" line="146"/>
<location filename="../gridform.h" line="149"/>
<source>Database error</source>
<translation>Chyba databáze</translation>
</message>
<message>
<location filename="../gridform.h" line="188"/>
<location filename="../gridform.h" line="204"/>
<source>Realy delete this record?</source>
<translation>Opravdu si přejete smazat tento záznam?</translation>
</message>
services/service.json
+12 -1
View File
@@ -21,5 +21,16 @@
\"vatType\" INTEGER NOT NULL);"
],
"dependencies" : []
"dependencies" : [],
"translations" : {
"CZ" : {
"accServiceName" : "Název",
"accServiceCode" : "Kód",
"price" : "Cena",
"active" : "Aktivní",
"salePossible" : "Umožnit slevu",
"serviceType" : "Druh",
"vatType" : "DPH"
}
}
}
services/services.cpp
+4 -1
View File
@@ -23,4 +23,7 @@ QIcon Services::pluginIcon()
{
return QIcon(":icons/servicesPlugin.svg");
}
QTranslator *Services::translator()
{
return translatorFrom(":/translations/services_");
}
services/services.h
+1
View File
@@ -23,6 +23,7 @@ protected:
// IPlugin interface
public:
virtual QIcon pluginIcon();
QTranslator *translator();
};
#endif // SERVICES_H
services/services.pro
+1
View File
@@ -73,3 +73,4 @@ DEPENDPATH += $$PWD/../qdecimal/src
RESOURCES += \
servicesrc.qrc
TRANSLATIONS = translations/services_cs_CZ.ts
services/servicesrc.qrc
+1
View File
@@ -1,5 +1,6 @@
<RCC>
<qresource prefix="/">
<file>icons/servicesPlugin.svg</file>
<file>translations/services_cs_CZ.qm</file>
</qresource>
</RCC>
services/translations/services_cs_CZ.qm
BIN
View File
Binary file not shown.
shop/shop.cpp
+5
View File
@@ -25,3 +25,8 @@ QWidget *Shop::ui()
qobject_cast<ShopForm*>(uiWidget)->loadLast();
return uiWidget;
}
QTranslator *Shop::translator()
{
return translatorFrom(":/translations/shop_");
}
shop/shop.h
+1 -3
View File
@@ -22,10 +22,8 @@ protected:
// IPlugin interface
public:
virtual QIcon pluginIcon();
// IPlugin interface
public:
virtual QWidget *ui() override;
QTranslator *translator();
};
#endif // SHOP_H
shop/shop.json
+27 -1
View File
@@ -51,5 +51,31 @@ CREATE TABLE \"Voucher\" (
DEFERRABLE INITIALLY DEFERRED);
"
],
"dependencies" : [ "ADDRESSBOOK" ]
"dependencies" : [ "ADDRESSBOOK" ],
"translations" : {
"CZ" : {
"name" : "Název",
"count" : "Počet",
"unitPrice" : "Jednotková cena",
"vatRate" : "Procento DPH",
"priceWitouthVat" : "Cena bez DPH",
"price" : "Cena",
"vatType" : "Sazba DPH",
"description" : "Popis",
"contact" : "Kontakt",
"vatRateHigh" : "Vysoká sazba",
"vatRateFirstLower" : "První snížená sazba",
"vatRateSecondLower" : "Druhá snížená sazba",
"priceNoVat" : "Cena zboží s nulovou DPH",
"priceVatHigh" : "Cena zboží s vysokou sazbou DPH",
"priceVatFirstLower" : "Cena zboží s první sníženou sazbou DPH",
"priceVatSecondLower" : "Cena zboží s druhou sníženou sazbou DPH",
"priceWitouthVat" : "Cena zboží bez DPH",
"totalPriceVatHigh" : "Celková cena zboží s vysokou sazbou DPH",
"totalPriceVatFirstLower" : "Celková cena zboží s první sníženou sazbou DPH",
"totalPriceVatSecondLower" : "Celková cena zboží s druhou sníženou sazbou DPH",
"totalPrice" : "Celková cena",
"status" : "Stav"
}
}
}
shop/shop.pro
+1
View File
@@ -90,3 +90,4 @@ FORMS += \
receiptsaveform.ui \
receiptloadform.ui
TRANSLATIONS = translations/shop_cs_CZ.ts
shop/shoprc.qrc
+1
View File
@@ -1,5 +1,6 @@
<RCC>
<qresource prefix="/">
<file>icons/shop.svg</file>
<file>translations/shop_cs_CZ.qm</file>
</qresource>
</RCC>
shop/translations/shop_cs_CZ.qm
BIN
View File
Binary file not shown.