report files language changes applied

thamizha · May 17, 2014 · 72dc995 · 72dc995
1 parent 094a96a
commit 72dc995
Show file tree

Hide file tree

Showing 7 changed files with 124 additions and 17 deletions.
diff --git a/src/angadimainwindow.cpp b/src/angadimainwindow.cpp
@@ -451,7 +451,17 @@ void AngadiMainWindow::openUnpaidBillReportTab()
     if(found == false){
         unpaidBillReport = new UnpaidBillReport();
         unpaidBillReport->setProperty("name", tabName);
-        ui->mainTab->addTab(unpaidBillReport, "UnPaid Bill Report");
+
+        if(checkLanguage() == "tamil_language"){                               //tab language settings
+            QTranslator translator;
+            translator.load("tamilLanguage_la");
+            QApplication::instance()->installTranslator(&translator);
+            ui->mainTab->addTab(unpaidBillReport, UnpaidBillReport::tr("UnPaid Bill Report"));
+        }
+        else{
+            ui->mainTab->addTab(unpaidBillReport, "UnPaid Bill Report");
+        }
+
     }
     ui->mainTab->setCurrentWidget (unpaidBillReport);
 }
@@ -465,7 +475,16 @@ void AngadiMainWindow::openPeriodWiseSalesTab()
     if(found == false){
         periodWiseSalesForm = new PeriodWiseSalesForm;
         periodWiseSalesForm->setProperty("name", tabName);
-        ui->mainTab->addTab(periodWiseSalesForm, "Period Wise Sales");
+
+        if(checkLanguage() == "tamil_language"){                               //tab language settings
+            QTranslator translator;
+            translator.load("tamilLanguage_la");
+            QApplication::instance()->installTranslator(&translator);
+            ui->mainTab->addTab(periodWiseSalesForm, AngadiMainWindow::tr("Period Wise Sales"));
+        }
+        else{
+            ui->mainTab->addTab(periodWiseSalesForm, "Period Wise Sales");
+        }
     }
     ui->mainTab->setCurrentWidget (periodWiseSalesForm);
 }
@@ -479,7 +498,17 @@ void AngadiMainWindow::openTransactionReportTab()
     if(found == false){
         transactionReport = new TransactionReport();
         transactionReport->setProperty("name",tabName);
-        ui->mainTab->addTab(transactionReport, "Transaction Report");
+
+        if(checkLanguage() == "tamil_language"){                               //tab language settings
+            QTranslator translator;
+            translator.load("tamilLanguage_la");
+            QApplication::instance()->installTranslator(&translator);
+            ui->mainTab->addTab(transactionReport, AngadiMainWindow::tr("Transaction Report"));
+        }
+        else{
+            ui->mainTab->addTab(transactionReport, "Transaction Report");
+        }
+
     }
     ui->mainTab->setCurrentWidget (transactionReport);
 }

diff --git a/src/billform.cpp b/src/billform.cpp
@@ -1128,11 +1128,16 @@ void BillForm::addProductItem()
         errors.append("\nThe Product field may be empty or not in our store");
     }
 
-    if(!formValidation->isDouble(ui->lineEditQty->text()))
-        if(ui->lineEditQty->text().toDouble() < 0.005){
+    if(!formValidation->isDouble(ui->lineEditQty->text())){
             validError = 1;
-            errors.append("\n\nThe quantity field may be empty or its very low to sale");
+            errors.append("\n\nThe quantity field may be empty or not a number.");
         }
+
+    if(ui->lineEditQty->text().toDouble() < 0.005){
+                validError = 1;
+                errors.append("\n\nThe quantity field is very low to sale");
+            }
+
     if(validError == 0){
         int row;
         if(productUpdateFlag == 0){
@@ -1299,7 +1304,28 @@ void BillForm::convertDoubleAll()
 
 void BillForm::defaultProductList()
 {
-    header << "Product Name" << "Qunatity" << "Rate" << "Unit" << "Total" << "Product Id";
+
+    QString app_path;
+    app_path = QApplication::applicationDirPath() + QDir::separator() + "settings.ini";
+    QSettings settings(app_path,QSettings::IniFormat);
+    QString content = settings.value("s_language","").toString();
+
+    if(content == "tamil_language"){
+        QTranslator translator;
+        translator.load("tamilLanguage_la");
+    //  QApplication::installTranslator(&translator);
+        QApplication::instance()->installTranslator(&translator);
+        header << BillForm::tr("Product Name") << BillForm::tr("Quantity") << BillForm::tr("Unit Price") << BillForm::tr("Unit") << BillForm::tr("Total") << BillForm::tr("Product Id");
+     }else{
+        QTranslator translator;
+        translator.load("englishLanguage_la");
+    //  QApplication::installTranslator(&translator);
+        QApplication::instance()->installTranslator(&translator);
+        header << "Product Name" << "Quantity" << "Rate" << "Unit" << "Total" << "Product Id";
+    }
+
+
+
     columnCount = 6;
 
     ui->tableWidget->setColumnCount(columnCount);

diff --git a/src/englishLanguage_la.ts b/src/englishLanguage_la.ts
@@ -249,6 +249,10 @@
         <source>Are you sure you want to delete this bill?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Product Id</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BillSettings</name>
@@ -804,5 +808,13 @@
         <source>dd/MM/yyyy</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>UnPaid Bill Report</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/src/tamilLanguage_la.qm b/src/tamilLanguage_la.qm
diff --git a/src/tamilLanguage_la.ts b/src/tamilLanguage_la.ts
@@ -96,11 +96,11 @@
     </message>
     <message>
         <source>Bill Transactions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">பில் பரிவர்த்தனைகள்</translation>
     </message>
     <message>
         <source>Product List</source>
-        <translation type="unfinished">பொருட்கள்</translation>
+        <translation type="unfinished">பொருள்</translation>
     </message>
     <message>
         <source>Tamil</source>
@@ -124,7 +124,7 @@
     </message>
     <message>
         <source>Period Wise Sales</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">விற்பனை அறிக்கை</translation>
     </message>
     <message>
         <source>Transaction Report</source>
@@ -253,10 +253,18 @@
         <source>Quantity</source>
         <translation type="unfinished">அளவு</translation>
     </message>
+    <message>
+        <source>Rate</source>
+        <translation type="obsolete">விலை</translation>
+    </message>
     <message>
         <source>Are you sure you want to delete this bill?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Product Id</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BillSettings</name>
@@ -839,6 +847,10 @@
 </context>
 <context>
     <name>UnpaidBillReport</name>
+    <message>
+        <source>UnPaid Bill Report</source>
+        <translation type="unfinished">கடன் பில் அறிக்கை</translation>
+    </message>
     <message>
         <source>Form</source>
         <translation type="unfinished">படிவம்</translation>
@@ -859,6 +871,10 @@
         <source>To Date</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">தேதி</translation>
+    </message>
     <message>
         <source>Customer Name</source>
         <translation type="unfinished">வாடிக்கையாளர் பெயர்</translation>

diff --git a/src/unpaidbillreport.cpp b/src/unpaidbillreport.cpp
@@ -24,11 +24,32 @@ UnpaidBillReport::UnpaidBillReport(QWidget *parent) :
     billModel->setTable("bill");
     billModel->setEditStrategy(QSqlTableModel::OnManualSubmit);
     billModel->setRelation(3, QSqlRelation("customers", "id", "name"));
-    billModel->setHeaderData(1, Qt::Horizontal,QObject::tr("Invoice No"));
-    billModel->setHeaderData(2, Qt::Horizontal,QObject::tr("Date"));
-    billModel->setHeaderData(3, Qt::Horizontal,QObject::tr("Customer Name"));
-    billModel->setHeaderData(6, Qt::Horizontal,QObject::tr("Bill Amount"));
-    billModel->setHeaderData(7, Qt::Horizontal,QObject::tr("Balance"));
+
+    QString app_path;
+    app_path = QApplication::applicationDirPath() + QDir::separator() + "settings.ini";
+    QSettings settings(app_path,QSettings::IniFormat);
+    QString content = settings.value("s_language","").toString();
+
+    if(content == "tamil_language"){
+        QTranslator translator;
+        translator.load("tamilLanguage_la");
+    //  QApplication::installTranslator(&translator);
+        QApplication::instance()->installTranslator(&translator);
+        billModel->setHeaderData(1, Qt::Horizontal,UnpaidBillReport::tr("Invoice No"));
+        billModel->setHeaderData(2, Qt::Horizontal,UnpaidBillReport::tr("Date"));
+        billModel->setHeaderData(3, Qt::Horizontal,UnpaidBillReport::tr("Customer Name"));
+        billModel->setHeaderData(6, Qt::Horizontal,UnpaidBillReport::tr("Bill Amount"));
+        billModel->setHeaderData(7, Qt::Horizontal,UnpaidBillReport::tr("Balance"));
+
+     }else{
+        billModel->setHeaderData(1, Qt::Horizontal,QObject::tr("Invoice No"));
+        billModel->setHeaderData(2, Qt::Horizontal,QObject::tr("Date"));
+        billModel->setHeaderData(3, Qt::Horizontal,QObject::tr("Customer Name"));
+        billModel->setHeaderData(6, Qt::Horizontal,QObject::tr("Bill Amount"));
+        billModel->setHeaderData(7, Qt::Horizontal,QObject::tr("Balance"));
+    }
+
+
     filter = "paidStatus = 'U'";
     billModel->setFilter(filter);
     billModel->select();

diff --git a/src/unpaidbillreport.ui b/src/unpaidbillreport.ui
@@ -84,9 +84,9 @@
          <widget class="QLabel" name="label">
           <property name="geometry">
            <rect>
-            <x>776</x>
+            <x>690</x>
             <y>480</y>
-            <width>51</width>
+            <width>140</width>
             <height>21</height>
            </rect>
           </property>
@@ -100,6 +100,9 @@
           <property name="text">
            <string>Total</string>
           </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
          </widget>
          <widget class="QWidget" name="layoutWidget">
           <property name="geometry">