From c9ef4351e7b92d3891189d0da6a6f46371d0df93 Mon Sep 17 00:00:00 2001 From: Sagi Dayan Date: Thu, 26 Jun 2014 20:31:48 +0300 Subject: [PATCH 1/4] Init Translate stuff --- jceGrade.pro | 3 +- jce_en.ts | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++ jce_he.ts | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 248 insertions(+), 1 deletion(-) create mode 100644 jce_en.ts create mode 100644 jce_he.ts diff --git a/jceGrade.pro b/jceGrade.pro index b03a0f8..9e068ba 100644 --- a/jceGrade.pro +++ b/jceGrade.pro @@ -41,7 +41,8 @@ HEADERS += main/coursestablemanager.h \ src/data/savedata.h \ - +TRANSLATIONS = jce_en.ts \ + jce_he.ts FORMS += \ main/mainscreen.ui diff --git a/jce_en.ts b/jce_en.ts new file mode 100644 index 0000000..6c5c07c --- /dev/null +++ b/jce_en.ts @@ -0,0 +1,123 @@ + + + + + MainScreen + + + JCE Avg Calculator + + + + + + Login + + + + + Keep login + + + + + <color=#000000>Username + + + + + Password + + + + + Courses + + + + + <html><head/><body><p><span style=" font-weight:600;">Get your grades</span></p></body></html> + + + + + Add + + + + + <html><head/><body><p><span style=" font-weight:600;">Clear table</span></p></body></html> + + + + + Clear + + + + + Average: + + + + + Settings + + + + + Semester + + + + + Year + + + + + From + + + + + To + + + + + Only influence Courses + + + + + &About + + + + + Credits + + + + + Exit + + + + + How-To + + + + + Error + + + + + Not Connected + + + + diff --git a/jce_he.ts b/jce_he.ts new file mode 100644 index 0000000..eea906b --- /dev/null +++ b/jce_he.ts @@ -0,0 +1,123 @@ + + + + + MainScreen + + + JCE Avg Calculator + + + + + + Login + + + + + Keep login + + + + + <color=#000000>Username + + + + + Password + + + + + Courses + + + + + <html><head/><body><p><span style=" font-weight:600;">Get your grades</span></p></body></html> + + + + + Add + + + + + <html><head/><body><p><span style=" font-weight:600;">Clear table</span></p></body></html> + + + + + Clear + + + + + Average: + + + + + Settings + + + + + Semester + + + + + Year + + + + + From + + + + + To + + + + + Only influence Courses + + + + + &About + + + + + Credits + + + + + Exit + + + + + How-To + + + + + Error + + + + + Not Connected + + + + From 9d46e9ecf67458a799a101f2eb17e4c907a3e24c Mon Sep 17 00:00:00 2001 From: Sagi Dayan Date: Sat, 28 Jun 2014 01:22:44 +0300 Subject: [PATCH 2/4] Translated tr files --- jce_en.ts | 51 +++++++++++++++++++++++---------------------- jce_he.ts | 51 +++++++++++++++++++++++---------------------- main/main.cpp | 4 ++++ main/mainscreen.cpp | 2 ++ 4 files changed, 58 insertions(+), 50 deletions(-) diff --git a/jce_en.ts b/jce_en.ts index 6c5c07c..884c21c 100644 --- a/jce_en.ts +++ b/jce_en.ts @@ -6,118 +6,119 @@ JCE Avg Calculator - + JCE Manager Login - + Login Keep login - + Keep login + <color=#000000>Username - + Usernameasdfasdg Password - + Password Courses - + Grade Table <html><head/><body><p><span style=" font-weight:600;">Get your grades</span></p></body></html> - + Get Your Grades Add - + Add <html><head/><body><p><span style=" font-weight:600;">Clear table</span></p></body></html> - + Clear Table Clear - + Clear Average: - + Average: Settings - + Sattings Semester - + Senester Year - + Year From - + From To - + To Only influence Courses - + Only influence Courses &About - + &About Credits - + Credits Exit - + Exit How-To - + How-To - + Error - + Error - + Not Connected - + Not Connected diff --git a/jce_he.ts b/jce_he.ts index eea906b..1128c5a 100644 --- a/jce_he.ts +++ b/jce_he.ts @@ -6,118 +6,119 @@ JCE Avg Calculator - + JCE Manager Login - + התחבר Keep login - + שמור פרטים + <color=#000000>Username - + שם משתמש Password - + סיסמה Courses - + גיליון ציונים <html><head/><body><p><span style=" font-weight:600;">Get your grades</span></p></body></html> - + קבל את הציונים שלך Add - + הוספה <html><head/><body><p><span style=" font-weight:600;">Clear table</span></p></body></html> - + נקה טבלה Clear - + נקה Average: - + ממוצע: Settings - + הגדרות Semester - + סמסטר Year - + שנה From - + מסמסטר To - + לסמסטר Only influence Courses - + רק קורסים בעלי השפעה &About - + &אודות Credits - + אודות Exit - + יציאה How-To - + עזרה - + Error - + שגיאה - + Not Connected - + לא התחבר diff --git a/main/main.cpp b/main/main.cpp index db7f78f..acb3a23 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1,9 +1,13 @@ #include "mainscreen.h" #include +#include int main(int argc, char *argv[]) { + QTranslator translator; + translator.load("jce_he"); QApplication a(argc, argv); + a.installTranslator(&translator); MainScreen w; w.show(); diff --git a/main/mainscreen.cpp b/main/mainscreen.cpp index a43c4cf..206c1f1 100644 --- a/main/mainscreen.cpp +++ b/main/mainscreen.cpp @@ -8,6 +8,8 @@ MainScreen::MainScreen(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainScr this->setFixedSize(this->size()); //main not resizeable + ui->usrnmLabel->setText(tr("Username")); + //Login Tab ui->pswdLineEdit->setEchoMode((QLineEdit::Password)); From a25c22053267b0f4a29962a8b810216cfd63ef7e Mon Sep 17 00:00:00 2001 From: Sagi Dayan Date: Sat, 28 Jun 2014 06:36:10 +0300 Subject: [PATCH 3/4] Translate Works - Table and how-to still not working --- jce_en.qm | Bin 0 -> 2913 bytes jce_en.ts | 101 ++++++++++- jce_he.qm | Bin 0 -> 3003 bytes jce_he.ts | 343 +++++++++++++++++++++++------------ main/coursestablemanager.cpp | 3 +- main/main.cpp | 7 +- main/mainscreen.cpp | 25 ++- main/mainscreen.ui | 12 +- 8 files changed, 348 insertions(+), 143 deletions(-) create mode 100644 jce_en.qm create mode 100644 jce_he.qm diff --git a/jce_en.qm b/jce_en.qm new file mode 100644 index 0000000000000000000000000000000000000000..997de92addc809dd2472437d62493ead20f9f7bb GIT binary patch literal 2913 zcmbVOU1%It6h6Dz$xg<#gb+fITBcR%gC=SEBPFg2$!4=LNt2jOlqwZxcW!ov&dw|| zv)ODF1p_MdO;HI5Qn3oYR0x6~#iAlwkfQj~hk&3@ed&WgFM{};**dcgHxJ4rdv@-e z?|k1m_nbSM{mdM`e*4|GzCV2Mi{~$0-JK#zoF-DP5cNGpRQv$<&r<60WunwDrEa9~ z?0!n!JO?|Azf(l%94YVIBvM}_<)VL4Lkrtw z*xR)D8saKGE!l6vUZRrv5>f9PR66%J?2oj1;Z?+^#CzY2647{a4P^&<=GBjX`4x7s@4NgT(D9*WZ*PG&ueC=H0d`H> zdJy;N9qr;LzhV95d$g}$6I+?=l@;K2GM^`W*jt%z+ZxudW`4Rc4*NUoaj;&5J%PM> zVNb$tSwx!JgUA^=N|RJ3mzor)EU}mWk4~1|W{}2L?TleLrHUtnlVHFQ<;f;N26?2@ zDr}kWBj_{PT2Qxh*_trSv0S$7n(bV+k<0oG!_obqZHvc`=88dWI?d|0Jy!g*C~HB=k(0rYwbljvrY_!$J~Hm+U@ZtiW;|Uxw@lasz2{x>eYT zh)bQ^5S~#L6Eav0Fg+x5sEu!v)WBtfyn;agieL{HPkGJ8XA__NRA8+g)w&wj8tcYg zaz-OL{rQ!`^b@P4k(H&Tg^{)8aha?IbW;r?d<61Aunw{oLV6)(XT2j*aE-8P!n29* zyw$w%PXcj@9^wf5QXiL5FNV~d851`VtP+w|aL2**JF+-G1K+t4VcX*g*F;D8dHZU> zmb_kZCF+jeMcJKkv@cx=%`QmX+=RJYOmtux#8VK%t8xk8KTBoV5 zdMMLkW2!CFs!;)aTw^avOeuJt>&d)TcyF?@$TwBkw4}$PN;6^Ddh9ymxpi4oEv{GO ztQ7ftk$Df()5uWJd1TAOIt%UGpmD8~S+1`Pn+d&JG=dIuBd*?Aw>7fr$^b(&hYcx! z<_!AU!9O1>aj6F8@&$czqpIf(yVA6cKwh^&nh!NM5Qz7Phr@~ZwRs^Ly6sjiN2cK* zEx?_RGzai01Y%pnnn^|!L|L#rLyFgc-%F`1?8kN=ErJP=(NH>&O}c=KXF4vJvS^sb zhD>WFoRV-mx?X{)MWZg=OD1!}+2-MLa0whVe5A&2iF+5_K+n65BPxNAzAql3B_KQ9 zfV$$Gv>}_z)H$>`_8m!GT{5)f*lpc%*6pTnDgqSy4rMKx?0K}qsghB(WJT`>jI+h-J*-{ao@zKeep login Keep login + + <color=#000000>Username + Usernameasdfasdg + - <color=#000000>Username - Usernameasdfasdg + Username + Username @@ -120,5 +124,98 @@ Not Connected Not Connected + + + +CREDITS-ROOL-UP1 +A tiny Application to calculate your grades average. + + + +CREDITS-ROOL-UP2 +This software is licensed under Qt5's + + + + +CREDITS-ROOL-UP3 +The source code is available at github: + + + + +CREDITS-ROOL-UP4 +This front end is Powered by + + + + +DevBy +Developed By + + + + +Liran +Liran Ben Gida + + + + +Sagi +Sagi Dayan + + + + +Nadav +Nadav Luzzato + + + + +Tnks +Thanks to + + + + + +Code +Code + + + +Name +Course + + + +Type +Type + + + +Points +Points + + + +Hours +Weekly Hours + + + +Grade +Grade + + + +Additions +Additions + + + + diff --git a/jce_he.qm b/jce_he.qm new file mode 100644 index 0000000000000000000000000000000000000000..55f317ac942e414eee28b8006b78406783b8968b GIT binary patch literal 3003 zcmbVOZD?C%6h2Aso21tWrHoo+NH)h1rEB-$z!?Kw)~$A3+ch2dL5H`^yX<0mZ@IZ` z7k?-?aEd>j%0LjsAq-)Hh*Qz|F+>NlrcJlTtz8GpP@gnQrn zan5<4^PK0L-0-=0>&0K+di}=@>(4*)&KC>2i97>D>?~2^Nuqu4;r?k-PM;=f$dYnN z!Mhho$qi%ufLQm#ME;Y+-pmmNE)e_pe)tU&`-)@zn%K=3iPR0$^AOgCGt_hO6p>P* z-cuv+KS+Hi5SLx0{^V;!K0n0*&tv_aV#9wUZU+rL_Y&5_p0~f-LPT3VH#@ShU+-

_73o|HcKpCvV352KVF2m+C#(=Mm-4caeuL%J%2sr})_<`v^E+37q-4 zi1mraAEJK%XGKk(I*#|p)by775au)W_$J)@Z>q0;_#2*|yG#8RtLH>8e0C6ie+57H zq~P~p@cXoi=br|%m$qX41?x7TIEZyS)-2W?$a}vI5_%dCIY^t?G@E0yI4S`F*(Z+8 zog?Oi?Z>5hK+}!bsKvSA5e`i(&z4!1LTsL8*fo}Qot_FGwa1c?@KLVC+auu-GoFrw z$0Om?xMqY>b~?!)+ZZ}x8g|-B~B`ht@Q~wE|3P^Ko zi52TOYUqr|WyuKJ0xPX5LL+Q-TQ`lA%p=Ga@tZ@^1={7N8R(qkmX_eVWG*|wR1vJ? zz?|Sp6mc14%sW@t*cCi0BV-28>$r4-H$?}#_B=imYa8tE?`=CYuvNCn5V89TP>Xz6F03bfcuIRkGg6on4Llm(BP$=%25Vpx6bYladi(2SK=emSv zPzBD}RWR~^cY{sid4|mZ>^$C2gM}Kcw`RUwwr$5PVT;JD0J?=ZGq}2pyjFy|i2U(x z&8&9F!u#Na#&eyR(>OBACO31zK#486K1$S#bD4_@3a-F7!%D7kW7ISZK5BERVq4&m zhq{G`Fa?}S)qAT|Z{0}9HoVtiT4-@aCNjPGqv*U8m&#w2Of7%Z;^-KueG`?p9k6nH;B5Q^YKv9Oz4ITL#s0bOU`)8IA>9?+4_R@>Xs(;6@yv~rFyBe-nDjW zhJI$9d3p_CZvf_;3zGF|acxqDFR(JL>if1&8#IC_~1xQnw%qaC@J7i<%x^Ln>vb pz>8q3g1VGlm%yPEw~RFu=7Tvt5L{#BNqnx|O6be@F!Xvn{{a0s1-t+N literal 0 HcmV?d00001 diff --git a/jce_he.ts b/jce_he.ts index 1128c5a..4a4043a 100644 --- a/jce_he.ts +++ b/jce_he.ts @@ -2,123 +2,230 @@ - MainScreen - - - JCE Avg Calculator - JCE Manager - - - - - Login - התחבר - - - - Keep login - שמור פרטים - - - - - <color=#000000>Username - שם משתמש - - - - Password - סיסמה - - - - Courses - גיליון ציונים - - - - <html><head/><body><p><span style=" font-weight:600;">Get your grades</span></p></body></html> - קבל את הציונים שלך - - - - Add - הוספה - - - - <html><head/><body><p><span style=" font-weight:600;">Clear table</span></p></body></html> - נקה טבלה - - - - Clear - נקה - - - - Average: - ממוצע: - - - - Settings - הגדרות - - - - Semester - סמסטר - - - - Year - שנה - - - - From - מסמסטר - - - - To - לסמסטר - - - - Only influence Courses - רק קורסים בעלי השפעה - - - - &About - &אודות - - - - Credits - אודות - - - - Exit - יציאה - - - - How-To - עזרה - - - - Error - שגיאה - - - - Not Connected - לא התחבר - +MainScreen + + +JCE Avg Calculator +JCE Manager + + + + +Login +התחבר + + + +Keep login +שמור פרטים + + + + +Username +שם משתמש + + + +Password +סיסמה + + + +Courses +גיליון ציונים + + + +<html><head/><body><p><span style=" font-weight:600;">Get your grades</span></p></body></html> +קבל את הציונים שלך + + + +Add +הוספה + + + +<html><head/><body><p><span style=" font-weight:600;">Clear table</span></p></body></html> +נקה טבלה + + + +Clear +נקה + + + +Average: +ממוצע: + + + +Settings +הגדרות + + + +Semester +סמסטר + + + +Year +שנה + + + +From +מסמסטר + + + +To +לסמסטר + + + +Only influence Courses +רק קורסים בעלי השפעה + + + +&About +&אודות + + + +Credits +אודות + + + +Exit +יציאה + + + +How-To +עזרה + + + +Error +שגיאה + + + +Not Connected +לא התחבר + + + +Connecting +מנסה להתחבר + + + +Connected +מחובר + + + +Disconnected +מנותק + + + +CREDITS-ROOL-UP1 +אפליקציה קטנה לחישוב ציונים + + + +CREDITS-ROOL-UP2 +רישיון השימוש בתוכנה ובקוד הפתוח רשום תחת + + + + +CREDITS-ROOL-UP3 +כל קוד המקור של התוכנה נמצא בגיטהאב: + + + + +CREDITS-ROOL-UP4 +התוכנה פועלת בעזרת המנוע + + + + +DevBy +פותח ע"י + + + + +Liran +לירן בן גידה + + + + +Sagi +שגיא דיין + + + + +Nadav +נדב לוצטו + + + + +Tnks +תודה רבה ל + + + + + +Code +קוד קורס + + + +Name +קורס + + + +Type +סוג + + + +Points +נקודות זכות + + + +Hours +שעות שבועיות + + + +Grade +ציון + + + +Additions +הערות + + + + diff --git a/main/coursestablemanager.cpp b/main/coursestablemanager.cpp index dd935bc..28aca7a 100644 --- a/main/coursestablemanager.cpp +++ b/main/coursestablemanager.cpp @@ -12,13 +12,12 @@ coursesTableManager::coursesTableManager(QTableWidget *ptr, user *usrPtr) courseTBL->setRowCount(0); courseTBL->setColumnCount(COURSE_FIELDS); QStringList mz; - mz << "Serial" << "Name" << "Type" << "Points" << "Hours" << "Grade" << "Additions"; + mz << QObject::tr("Code") << QObject::tr("Name") << QObject::tr("Type") << QObject::tr("Points") << QObject::tr("Hours") << QObject::tr("Grade") << QObject::tr("Additions"); courseTBL->setHorizontalHeaderLabels(mz); courseTBL->verticalHeader()->setVisible(true); courseTBL->setSelectionMode(QAbstractItemView::SingleSelection); courseTBL->setShowGrid(true); courseTBL->setStyleSheet("QTableView {selection-background-color: red;}"); - } coursesTableManager::~coursesTableManager() diff --git a/main/main.cpp b/main/main.cpp index acb3a23..bf0abda 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1,12 +1,15 @@ #include "mainscreen.h" #include #include +#include int main(int argc, char *argv[]) { - QTranslator translator; - translator.load("jce_he"); QApplication a(argc, argv); + QTranslator translator; + bool is; + is = translator.load("jce_he.qm", a.applicationDirPath()); + qDebug() << " =============== " << is ; a.installTranslator(&translator); MainScreen w; w.show(); diff --git a/main/mainscreen.cpp b/main/mainscreen.cpp index 206c1f1..316a18d 100644 --- a/main/mainscreen.cpp +++ b/main/mainscreen.cpp @@ -8,7 +8,6 @@ MainScreen::MainScreen(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainScr this->setFixedSize(this->size()); //main not resizeable - ui->usrnmLabel->setText(tr("Username")); //Login Tab ui->pswdLineEdit->setEchoMode((QLineEdit::Password)); @@ -216,15 +215,15 @@ void MainScreen::setLabelConnectionStatus(jceLogin::jceStatus statusDescription) case jceLogin::jceStatus::JCE_START_VALIDATING_PROGRESS: iconPix.load(":/icons/blueStatusIcon.png"); - statusLabel->setText("Connecting"); + statusLabel->setText(tr("Connecting")); break; case jceLogin::jceStatus::JCE_YOU_ARE_IN: iconPix.load(":/icons/greenStatusIcon.png"); - statusLabel->setText("Connected"); + statusLabel->setText(tr("Connected")); break; default: iconPix.load(":/icons/redStatusIcon.png"); - statusLabel->setText("Disconnected"); + statusLabel->setText(tr("Disconnected")); break; } ButtomStatusLabel->setPixmap(iconPix); @@ -233,19 +232,19 @@ void MainScreen::setLabelConnectionStatus(jceLogin::jceStatus statusDescription) } void MainScreen::on_actionCredits_triggered() { - QMessageBox::about(this, "About", "A tiny Application to calculate your grades average. v1.0

" - "This software is licensed under Qt5's
GNU LESSER GENERAL PUBLIC LICENSE V2
" - "The source code is available at github:
" + QMessageBox::about(this, "About", tr("CREDITS-ROOL-UP1") + " v1.0

" + + tr("CREDITS-ROOL-UP2")+"
GNU LESSER GENERAL PUBLIC LICENSE V2
" + + tr("CREDITS-ROOL-UP3")+"
" "jceAverageCalculator Repository" - "

This front end is Powered by Jce Connection

" - "Made by:" + "

"+tr("CREDITS-ROOL-UP4")+" Jce Connection

" + +tr("DevBy")+":" "

" - "Thanks to: " + +tr("Tnks")+ "... :" ""); } diff --git a/main/mainscreen.ui b/main/mainscreen.ui index 46b1ff9..d878a9a 100644 --- a/main/mainscreen.ui +++ b/main/mainscreen.ui @@ -61,7 +61,7 @@ background: qlineargradient(spread:pad, x1:0.496, y1:0, x2:0.508, y2:1, stop:0 r QTabWidget::Rounded - 0 + 1 false @@ -231,7 +231,7 @@ font-size: 15px; - <color=#000000>Username + Username Qt::RichText @@ -584,6 +584,9 @@ font-size: 15px; false + + false + 2009 @@ -593,9 +596,6 @@ font-size: 15px; 2009 - - false - @@ -675,7 +675,7 @@ font-size: 15px; 0 0 855 - 21 + 29 From ca2b2d3cca1f89b0ef57107a540b8ec93c817c98 Mon Sep 17 00:00:00 2001 From: Sagi Dayan Date: Sat, 28 Jun 2014 07:15:19 +0300 Subject: [PATCH 4/4] Translation! most of the ui is translated English & Hebrew, the Lang will be as the user's OS. qm files need to be in the debuging directory for this to work. --- jce_en.qm | Bin 2913 -> 4085 bytes jce_en.ts | 32 ++++++++++++++++++++++++++++++++ jce_he.qm | Bin 3003 -> 3933 bytes jce_he.ts | 31 +++++++++++++++++++++++++++++++ main/main.cpp | 5 ++--- main/mainscreen.cpp | 23 +++++++---------------- 6 files changed, 72 insertions(+), 19 deletions(-) diff --git a/jce_en.qm b/jce_en.qm index 997de92addc809dd2472437d62493ead20f9f7bb..fed56a9ec7bdfff0d5b164502dc13c1e14b3cabd 100644 GIT binary patch delta 1352 zcmZ`%OGuPq6g@Nf+xR<43&}-TfAkaA=6VP6BVIF!MvQAnr38XbhJeSNw%m( zAr!7cNrE;8LyKx-52DA)WvdKZwP_*RB9P9#|NM>v$|Dd)i z1{e##uGbIikL0W8U_AZ?c$Zg0c?=b$}25P#|)5y5v7ka+T02KxJXM&8s z;h$|G(kx>uP`Q_}jqxjEJFxR2V+Y_l&e+Mgg5JCHyr03P#57a%Z+#7#3XGfAR8bE0`4%NEVaL)?4o%zH0Zna@|7?^kO9*QEEvLO&JPdEdA) zjJ?x`U5)OVM4{g`ZwwFN0+Pref;6(QFo6_CxwiOkXOjrv2G1?VB*Kg%TxIy>csH$? zkgn3a6(ULk6CP1g$)9oljK8mC`mIr$zYjmJMG+@V2`opjxV9cv5R2=WwhQtk!OtpI zIQa~31o#tz7LFpwRhD0hG#i+aIuRfl*$FA0)hp;Z9!2;i%Ne!`!{k-?w08*Cwch42 z!0Uo9yrbIFMizS#{E6hP#)Xxg7$(+cc_WQ6(Nf;BO-=cPK4m0+T5NB-FVM0Vp+QE+ zdD{Z9Z)8iAV@x+^A@eC2@_(a8l~!D=y{z8Iz@3&k>a<-K=Pa&MY#-)Ypv41Qz0=gD zNFU18wX3=*HB{I~70fA0F%!~E3d4kT@=+48n^}5p6LHiFMWIxBqX8N#_6Cahadj=k zA!^UM;>?=MxpgSF4Gi*l1YJbzRb&xpi`zudey52hV|3(i4iu+~x$P$xqJeR0kq71D zI-<;u!O9m!%ZSR`IcAjJk?ne^tz($f#t1L(&#Bt(5k%Qoa1QWp7n-oUq1=>CF{SXQ H@><0|nRyBe delta 264 zcmew=|4?j#2&V-D1M7MQ2F|dFvTF70b_}f3Z!$1&)G)AaRR)SGGO!*<1=7_FtiPLp z^j!uoZ6MA3ioxsDOa=y)%?v&>lYsPl2EX>DK$D6Y{BtG)>4glz9CZu~Y?By*WB&o^ zOAH}ZZ43GT11)yus??JMYCFKytODe-Z|3UW@EIsx r&&_ohNHaF`*sKo%>f6k-o3R*3znUD%sLjO1vAKzHDeLBL?kpAn<3dA# diff --git a/jce_en.ts b/jce_en.ts index 7eb89e4..4db1d16 100644 --- a/jce_en.ts +++ b/jce_en.ts @@ -216,6 +216,38 @@ + + +HELP1 +Insert your username and password correctly + + + +HELP2 +Login and wait for the ball in the status (buttom) bar to become Green + + + +HELP3 +Check the Settings to select your date Interval + + + +HELP4 +Press Courses tab and then press the Add button and wait until courses will be loaded into the table + + + +HELP5 +Change the once of the grade cell and see your average is changing. + + + +HELP6 +Tip: Need to change Date interval? in Courses tab click Clean, then change the date interval then hit the Add button again! :-) + + + diff --git a/jce_he.qm b/jce_he.qm index 55f317ac942e414eee28b8006b78406783b8968b..e0f821f56227cb3248bae53d12e3b7320e4a30de 100644 GIT binary patch delta 1140 zcmZWnUr19?9RBUL-|lv&Z-Nh%C`BOtp*aJq)7noV(dpjC;P{**U-OeBXD@Z1rl* zM3v_j5l<6Uy6$b=G3s>@KQM_Z+KFej0Y4JI9>A)fIDZ=$q|OH5rYY*24-q-D6bSW$ z;Wz~z`-ogBumyMp=m-7+wi2o5fNezX&A@hGh>nauMPHPT4h4xkBh>A_Nu#8lrS8+e ziL^;NdE*Xn!SU#QGZFb5`JFl%wkS>36C$rq8SdDJ^?K#m{dZU=C35)KnNdxCS9}fJ0p5~^97Si)o4G*c$vRSvK*=iXA4wu z5GPQlI3`JS%nd0+kmvBTcQ?vCCNE-D>@;zh!E2~u5U|2}`LQi31ZZ7-=Pz}ixjGR1 zrl`Gv5_>V!i@YQ`gwZH!Q*uRco*~uQ5v*Wl@G{m!hl$fn%oF9O`K8H;4U@JR9j1^C zFQIu|iY_6Lgc(U@VH7#T*hWYO@=fDNAx`9949Vuwxx7R diff --git a/jce_he.ts b/jce_he.ts index 4a4043a..e28c3bd 100644 --- a/jce_he.ts +++ b/jce_he.ts @@ -225,6 +225,37 @@ הערות + + +HELP1 +הכנס את שם המשתמש והסיסמה כמו שצריך + + + +HELP2 +לחץ התחבר והמתן על שהתוכנה תתחבר, עיגול ירוק למטה + + + +HELP3 +הכנס להגדרות כדי לבחור את טווח הגיליון + + + +HELP4 +לחץ על העמוד של גיליון הציונים ולחץ הוספהת המתן עד שהציונים יופיעו בטבלה + + + +HELP5 +שנה ושחק עם הציונים כדי לראות את הממוצע משתנה + + + +HELP6 +טיפ: רוצה לשנות את תקופת הזמן? לחץ על נקה, ולאחר מכן שנה את תקופת הזמן ולחץ על הוספה שוב! :-) + + diff --git a/main/main.cpp b/main/main.cpp index bf0abda..96f4be6 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -7,9 +7,8 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); QTranslator translator; - bool is; - is = translator.load("jce_he.qm", a.applicationDirPath()); - qDebug() << " =============== " << is ; + QString locale = QLocale::system().name(); + translator.load("jce_"+locale , a.applicationDirPath()); a.installTranslator(&translator); MainScreen w; w.show(); diff --git a/main/mainscreen.cpp b/main/mainscreen.cpp index 316a18d..01f5b16 100644 --- a/main/mainscreen.cpp +++ b/main/mainscreen.cpp @@ -275,21 +275,12 @@ void MainScreen::on_actionHow_To_triggered() QMessageBox::information(this,"How To", "How To.." "
    " - "
  • Insert your username and password correctly
    • " - "
  • Login and wait for the ball in the status (buttom) bar to become Green
    • " - "
  • Check Settings to select your date Interval
    • " - "
  • Press Courses tab and then press Add button and wait until courses will be loaded into the table
    • " - "
  • Change the once of the grade cell and see your average is changing.
    • " - "

    Tip: Need to change Date interval? in Courses tab click Clean, then change the date interval then hit Add again! :-)" - "
" - "

הסבר" - "
    " - "
  • הכנס את שם המשתמש והסיסמה שלך כנדרש
    • " - "
  • לחץ התחבר והמתן מספר שניות עד להופעת כדור ירוק בתחתית המסך
    • " - "
  • בדוק הגדרות כדי לבדוק את תקופת הזמן אותם תרצה להציג
    • " - "
  • לחץ על Courses ולאחר מכן על כפתור Add והמתן מספר שניות עד להופעת הקורסים בטבלה
    • " - "
  • כעת ניתן לשנות ערכים בתא הציונים ולראות את ממוצע הציונים בהתאם
    • " - "

    טיפ: רוצה לשנות את תקופת הזמן? לחץ על Clean , ולאחר מכן שנה את תקופת הזמן ולחץ על Add שוב! :-)" - "
"); + "
  • "+tr("HELP1")+"
    • " + "
  • "+tr("HELP2")+"
    • " + "
  • "+tr("HELP3")+"
    • " + "
  • "+tr("HELP4")+"
    • " + "
  • "+tr("HELP5")+"
    • " + "

    "+tr("HELP6")+ + ""); }