From 92252f33c3327e3acb22927dceb10d015245db0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Tue, 15 Feb 2011 19:17:18 +0100 Subject: [PATCH] Searchs aren't case sensitive enough. Default categories in native language (even if switching language at runtime) --- ChangeLog | 4 +- ressources/po/french.mo | Bin 7754 -> 7825 bytes ressources/po/french.po | 140 +++++++++++++++++----------------- ressources/po/kisscount.pot | 110 +++++++++++++------------- src/controller/KissCount.cpp | 18 +++-- src/model/Database.cpp | 2 +- src/view/AccountPanel.cpp | 2 +- src/view/PreferencesPanel.cpp | 2 +- src/view/grid/GridAccount.cpp | 2 +- 9 files changed, 148 insertions(+), 132 deletions(-) diff --git a/ChangeLog b/ChangeLog index f23b3bc..5c06f43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -v0.2_dev (14/02/2011) +v0.2_dev (15/02/2011) ** User ** Better use of sizers (so better interface!) @@ -9,6 +9,8 @@ v0.2_dev (14/02/2011) Possibility to find operations with unknown category/account Possibility to work on multiple operations (rename, change category, change account) Add virtual accounts + Searchs aren't case sensitive enough + Default categories in native language (even if switching language at runtime) ** Dev ** Use a factory to create panels (prepare for plug-in) diff --git a/ressources/po/french.mo b/ressources/po/french.mo index d0ccb9479a9553883bf6cd9ce92b0e9fccd6d77e..18167fc8d5a6e6576b51322776b4b692305d83d2 100644 GIT binary patch delta 3042 zcmYk;d2AI$9Ki7bS_>4Rv6r@}#f?9-1xo?4@a+Irr+)pk`p@Pa2il7#PT1+$= zF(MH!LToe`qkst-5ENpFi4qfp_=jK!k|2Txzu))9giU|@ncbb8<2SPpjtqFIH2F(z z#w&s2d7=X`FC&Eg_+evC9J{kaXoT-!3;YP1;}_TpkK)aE8k^t+9EE?!`$L+Aki~Tw z+T>KU-fZMA84{druo|tf33)ecLo2?H4r~{8#INH0UonU4^JoYE;!T*zXbP|yTE8bY z#j$AnlhJl7Fq{6vA_~r|3LVJCcwHCWi8fG=cJw7W^RMw1{25!~MRY)oXvBfELf>nT zcGwlE5_%&^4gndaw!X~s{9oq43 z^!?AU6COjC=0XedZ$~Yt(!zI+>X|J8=cT8wB2*) zdzaA6T|qON!RQ-ec1!Ya1I@YNj5=^)aG@8P@_}eZ#-IZ%L)r+_uoe^84lkn}v?Luq zFF*&-3+=FPv^3ryj@BQSq+mzo=!oW`YqtQMX#%ZSjW$?=u6-@~-p+V`4?5FN(E)!R zJs6*V6a5~$@cc(C!sI`((3u7D#nI@9Ct&JxiB_NkScrDCJX(dmw+0<}5`C`*t-l4$ z+;*JVAcQy3de>NA_g}b9fqS7j-;!(I8C}Es&=*JIB%FwhHS9tMxDU<1eze0Q=u-ZG ztVTGE4&V}+!E4d1*69r7VK=}3eiZCzHk#T5`r?M@3uvld#_qTeZSXWYfIrXyUx{YX zi0!oI@wBvJV$A6)lwPAjG zNpjIlw22m?nd*VQ-y5B1KXh*m#iR|EQ84v0&=*!<309*i{TN;I1M&GGwEj_a)1F2f zJc~}`BHCeSo3?Q@2OV%e`hNGe%hIl07MOqfi_l%tAX#pd+q~_t!;hfa(S|mo zGxV5AOd?i$!BIsFBpxT`5qA^*EIYu-#Bjo+yWhXZW5hkFQV35*#iem{v2_!wZgQh)%>1qLgr-jVJmM<@Wy|QAAV{Zk8p)Mq&oRGNz6( zoF9qh|Jg)gV!U`FIyfo|WBH*Q?k&He{4nLB*_`GRqX-XvQ^KHBiJxGcN-U^5*fg*1 zc+-qzU#_YN_qN9!L`A9;!gDx_c$(N8@2!Z+=vbZ;U5lLw7t>=Iu_{$c|8KNcEU(8x zf=@9S?xfI#SVYVvx)S#iQ-~478e$z$LU^zXLvgBm=uOyVxWUysFvADsugHg!D3*3dBLCm0m8-jO#lD@ delta 2972 zcmYk-dra0<9LMp4qKM=LOu-8RdBd_V9UYc9E zn&BU1*%mf)+S0W)vYM4Gtu?FJ+^l8OKT`j(-fuWH&iFj9-}RjH`<~zP@XGMhrHKm} z$$JBB8|g+WlSB9rUvI?+ZFyP<&9MsG;VNv4Tkv+=gKh9_OvR%(4o}77skeoY!hR;& zWe$2>KJu3cMSR-f2=syqKo%v1OQpHSzd6*q;3(=m4K#OZ*D6@jLYTYuFky zn5F$^qy6^AG{z78+3?9q(TSAD{h84vXb0=ifvV9b--#XZElkH_=!CvNC-M_|-$iu5 zE688C!3RYSEg3A8@k1ILcH9wLV0PT^fp%1Yc2tB`W;kZzc=Y-?n2QVJ`EBTu?Li0H zhfZvN+&_%oSBD7_j`86P>*I-U(FvVLXZ#Cxz$@sJH=|rWaVBP9-?(3jR6A6l*Udx+ zUXI?s0rPM#x->`IQGW+I#{nnsGrC5X(GITRP)wm0pJXIDz*zLUDd+?%(d!l?a}2d; zzjf$+$I;52L@W9wHp8>+slOe3&jFw0H)PCk9W8kZk7=ng&3gx485@&UHhr%eM{rJf#-1GChrRIQXyPIp-jK=yIn#D%X*)%8(1G*O0s2P=q4$-b6D~vV8-rdy z5v|xXtV{}FHhSF&*3~6Ci5yCVGiQ!pRbq8%PUCvX^jl4H?& zbZO3^6Zs1nBP4Oqt{|YuJMVN)YOjXEVc!>`uREys5E;{f>=u7%3 zx+G`ON}P}WidO1(^!}@8MQ@_-RP(IH{@P>0(syIS8wOwr4na%00v%vOJYS7ozXN?) z51<_$L@V(DI^e13=h1J_3IBlJe;IS}Ru=X5Ku+hz-}r%Oi6)~R&x^;a&{FP<`?cs= zo6eUM3LCFZ03twaZ^K_~PoTG{>R^@kE{>|o<0@(`hde|2842%Y(A z^vP<_HQp6{En16S{~lVgCjO2my7NENfeO$W7o#1H zh?b+Joq;`YF51CX9EIGHLmGDZUB}5}A{j$` z!WW23(X=gQ$I1Hc^p7XD;h?z9H!VC)o+Ca?E}_t&n%qTPvUy~!-+!B>9!M4t|G`+& zIfU0DJVBba8SJbhzM!j!>p7J?L>?xE#CNF~Sx;;(%?Q$y^dPp4q+$G_Y}`wza2QDj zkV#}Xu{}VN$tE(6+(T?7PiIljIZI;70!c9L5&ED`5qhy*s^ihXik4LwlM}zl>AJa#BFbh^-&-i#*F6 z+63|4khveF4Z8PCjZa>Y!xm(?9i+teayeqDb0 e8%cF%GBT4=igO1HEh!pY_h*Mgsk`6IzWOg@hw38$ diff --git a/ressources/po/french.po b/ressources/po/french.po index 431accb..9d82426 100644 --- a/ressources/po/french.po +++ b/ressources/po/french.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-13 19:27+0100\n" +"POT-Creation-Date: 2011-02-15 19:15+0100\n" "PO-Revision-Date: \n" "Last-Translator: Soutadé \n" "Language-Team: \n" @@ -20,16 +20,16 @@ msgstr "" # FIRST AUTHOR , YEAR. # #: src/view/StatsPanel.cpp:358 -#: src/view/PreferencesPanel.cpp:817 +#: src/view/PreferencesPanel.cpp:831 msgid " - " msgstr " - " #: src/view/UsersDialog.cpp:120 -#: src/view/PreferencesPanel.cpp:482 -#: src/view/PreferencesPanel.cpp:502 -#: src/view/PreferencesPanel.cpp:712 -#: src/view/PreferencesPanel.cpp:731 -#: src/view/PreferencesPanel.cpp:775 +#: src/view/PreferencesPanel.cpp:495 +#: src/view/PreferencesPanel.cpp:515 +#: src/view/PreferencesPanel.cpp:726 +#: src/view/PreferencesPanel.cpp:745 +#: src/view/PreferencesPanel.cpp:789 msgid " already exists" msgstr " existe déjà" @@ -41,11 +41,11 @@ msgstr " entrées trouvées" msgid " not found, aborting" msgstr " non trouvé, arrêt" -#: src/view/AccountPanel.cpp:757 +#: src/view/AccountPanel.cpp:766 msgid " operations ?" msgstr " opérations ?" -#: src/view/PreferencesPanel.cpp:824 +#: src/view/PreferencesPanel.cpp:838 msgid " profil ?" msgstr " profil ?" @@ -62,12 +62,12 @@ msgstr "1 entrée trouvée" msgid "Account" msgstr "Compte" -#: src/view/PreferencesPanel.cpp:482 -#: src/view/PreferencesPanel.cpp:502 +#: src/view/PreferencesPanel.cpp:495 +#: src/view/PreferencesPanel.cpp:515 msgid "Account " msgstr "Le compte " -#: src/controller/KissCount.cpp:363 +#: src/controller/KissCount.cpp:370 msgid "Account 1" msgstr "Compte 1" @@ -92,8 +92,8 @@ msgstr "Montant min" msgid "Amount to" msgstr "Montant max" -#: src/view/PreferencesPanel.cpp:824 -#: src/view/AccountPanel.cpp:752 +#: src/view/PreferencesPanel.cpp:838 +#: src/view/AccountPanel.cpp:761 msgid "Are you sure want to delete " msgstr "Etes vous sûr de vouloir supprimer " @@ -101,15 +101,15 @@ msgstr "Etes vous sûr de vouloir supprimer " msgid "Are you sure want to delete : \n" msgstr "Etes vous sûr de vouloir supprimer : \n" -#: src/view/PreferencesPanel.cpp:361 +#: src/view/PreferencesPanel.cpp:368 msgid "Ascending" msgstr "Croissant" -#: src/view/PreferencesPanel.cpp:285 +#: src/view/PreferencesPanel.cpp:292 msgid "Background color" msgstr "Couleur d'arrière plan" -#: src/view/PreferencesPanel.cpp:199 +#: src/view/PreferencesPanel.cpp:200 msgid "Blocked" msgstr "Bloqué" @@ -119,13 +119,13 @@ msgstr "Bloqué" msgid "Cancel" msgstr "Annuler" -#: src/view/grid/GridAccount.cpp:1267 -#: src/view/grid/GridAccount.cpp:1274 +#: src/view/grid/GridAccount.cpp:1271 +#: src/view/grid/GridAccount.cpp:1278 msgid "Cannot group these operations" msgstr "Impossible de grouper ces opérations" -#: src/view/grid/GridAccount.cpp:1393 -#: src/view/grid/GridAccount.cpp:1399 +#: src/view/grid/GridAccount.cpp:1397 +#: src/view/grid/GridAccount.cpp:1403 msgid "Cannot ungroup these operations" msgstr "Impossible de dégrouper ces opérations" @@ -138,8 +138,8 @@ msgstr "Catégories" msgid "Category" msgstr "Catégorie" -#: src/view/PreferencesPanel.cpp:712 -#: src/view/PreferencesPanel.cpp:731 +#: src/view/PreferencesPanel.cpp:726 +#: src/view/PreferencesPanel.cpp:745 msgid "Category " msgstr "La catégorie " @@ -224,13 +224,13 @@ msgstr "Débit" msgid "Default" msgstr "Défaut" -#: src/view/PreferencesPanel.cpp:200 -#: src/view/PreferencesPanel.cpp:288 -#: src/view/AccountPanel.cpp:611 +#: src/view/PreferencesPanel.cpp:201 +#: src/view/PreferencesPanel.cpp:295 +#: src/view/AccountPanel.cpp:620 msgid "Delete" msgstr "Supprimer" -#: src/view/PreferencesPanel.cpp:362 +#: src/view/PreferencesPanel.cpp:369 msgid "Descending" msgstr "Décroissant" @@ -249,20 +249,20 @@ msgstr "Nouvelle description" #: src/view/SearchPanel.cpp:189 #: src/view/SearchPanel.cpp:203 #: src/view/SearchPanel.cpp:214 -#: src/view/PreferencesPanel.cpp:422 -#: src/view/PreferencesPanel.cpp:482 -#: src/view/PreferencesPanel.cpp:502 -#: src/view/PreferencesPanel.cpp:712 -#: src/view/PreferencesPanel.cpp:731 -#: src/view/PreferencesPanel.cpp:769 -#: src/view/PreferencesPanel.cpp:775 +#: src/view/PreferencesPanel.cpp:435 +#: src/view/PreferencesPanel.cpp:495 +#: src/view/PreferencesPanel.cpp:515 +#: src/view/PreferencesPanel.cpp:726 +#: src/view/PreferencesPanel.cpp:745 +#: src/view/PreferencesPanel.cpp:783 +#: src/view/PreferencesPanel.cpp:789 #: src/view/PasswordDialog.cpp:72 #: src/view/PasswordDialog.cpp:78 -#: src/view/AccountPanel.cpp:748 -#: src/view/grid/GridAccount.cpp:1267 -#: src/view/grid/GridAccount.cpp:1274 -#: src/view/grid/GridAccount.cpp:1393 -#: src/view/grid/GridAccount.cpp:1399 +#: src/view/AccountPanel.cpp:757 +#: src/view/grid/GridAccount.cpp:1271 +#: src/view/grid/GridAccount.cpp:1278 +#: src/view/grid/GridAccount.cpp:1397 +#: src/view/grid/GridAccount.cpp:1403 #: src/view/grid/wxGridCellFormulaEditor.cpp:69 #: src/model/Database.cpp:42 #: src/model/Database.cpp:49 @@ -284,15 +284,15 @@ msgstr "Valeur finale" #: src/view/SearchPanel.cpp:84 #: src/view/grid/GridAccount.cpp:329 -#: src/controller/KissCount.cpp:379 +#: src/controller/KissCount.cpp:361 msgid "Fix" msgstr "Fixe" -#: src/view/PreferencesPanel.cpp:287 +#: src/view/PreferencesPanel.cpp:294 msgid "Font" msgstr "Police" -#: src/view/PreferencesPanel.cpp:286 +#: src/view/PreferencesPanel.cpp:293 msgid "Foreground color" msgstr "Couleur d'avant plan" @@ -305,11 +305,11 @@ msgid "From " msgstr "A partir de " #: src/view/GenerateDialog.cpp:31 -#: src/view/AccountPanel.cpp:608 +#: src/view/AccountPanel.cpp:617 msgid "Generate month" msgstr "Générer mois" -#: src/controller/KissCount.cpp:381 +#: src/controller/KissCount.cpp:361 msgid "Groceries" msgstr "Courses" @@ -317,7 +317,7 @@ msgstr "Courses" msgid "Group" msgstr "Grouper" -#: src/controller/KissCount.cpp:383 +#: src/controller/KissCount.cpp:361 msgid "Hobbies" msgstr "Loisirs" @@ -345,7 +345,7 @@ msgstr "Intervalle de temps invalide" msgid "Invalid formula !" msgstr "Formule invalide !" -#: src/view/PreferencesPanel.cpp:769 +#: src/view/PreferencesPanel.cpp:783 msgid "Invalid name" msgstr "Nom invalide" @@ -361,11 +361,11 @@ msgstr "Mot de passe invalide" msgid "Invalide date range" msgstr "Intervalle de temps invalide" -#: src/view/PreferencesPanel.cpp:422 +#: src/view/PreferencesPanel.cpp:435 msgid "It must be at least one account !" msgstr "Il doit y avoir au moins un compte !" -#: src/view/AccountPanel.cpp:748 +#: src/view/AccountPanel.cpp:757 msgid "It must be at least one month !" msgstr "Il doit rester au moins un mois" @@ -374,9 +374,9 @@ msgid "Kill me" msgstr "Kill me" #: src/view/StatsPanel.cpp:377 -#: src/view/PreferencesPanel.cpp:809 -#: src/view/PreferencesPanel.cpp:812 -#: src/model/Database_Update.cpp:127 +#: src/view/PreferencesPanel.cpp:823 +#: src/view/PreferencesPanel.cpp:826 +#: src/model/Database_Update.cpp:135 msgid "KissCount" msgstr "KissCount" @@ -384,21 +384,21 @@ msgstr "KissCount" msgid "Language" msgstr "Langue" -#: src/view/PreferencesPanel.cpp:812 +#: src/view/PreferencesPanel.cpp:826 msgid "Language not changed" msgstr "Langue non changée" -#: src/view/PreferencesPanel.cpp:809 +#: src/view/PreferencesPanel.cpp:823 msgid "Language successfully changed, please go to another panel" msgstr "Langue changée, allez sur un autre panneau pour rendre le changement effectif" #: src/view/PreferencesPanel.cpp:72 #: src/view/PreferencesPanel.cpp:196 -#: src/view/PreferencesPanel.cpp:284 +#: src/view/PreferencesPanel.cpp:291 msgid "Name" msgstr "Nom" -#: src/view/PreferencesPanel.cpp:781 +#: src/view/PreferencesPanel.cpp:795 msgid "Name changed" msgstr "Nom changé" @@ -429,8 +429,8 @@ msgstr "Courantes" #: src/view/SearchPanel.cpp:304 #: src/view/SearchPanel.cpp:346 -#: src/view/PreferencesPanel.cpp:427 -#: src/view/PreferencesPanel.cpp:687 +#: src/view/PreferencesPanel.cpp:440 +#: src/view/PreferencesPanel.cpp:701 msgid "None" msgstr "Aucun" @@ -452,8 +452,8 @@ msgstr "OK" msgid "Old password " msgstr "Ancien mot de passe " -#: src/controller/KissCount.cpp:385 -msgid "Operating exepense" +#: src/controller/KissCount.cpp:361 +msgid "Operating expense" msgstr "Fonctionnement" #: src/view/PreferencesPanel.cpp:63 @@ -465,7 +465,7 @@ msgstr "Ordre des opérations" msgid "Operations" msgstr "Opérations" -#: src/controller/KissCount.cpp:389 +#: src/controller/KissCount.cpp:362 msgid "Other" msgstr "Autres" @@ -500,8 +500,8 @@ msgid "Please retype new password" msgstr "Re entrez le mot de passe" #: src/view/PreferencesPanel.cpp:184 -#: src/view/PreferencesPanel.cpp:783 -#: src/view/PreferencesPanel.cpp:817 +#: src/view/PreferencesPanel.cpp:797 +#: src/view/PreferencesPanel.cpp:831 msgid "Preferences" msgstr "Préférences" @@ -564,7 +564,7 @@ msgstr "Dégrouper" msgid "Unable to open Database" msgstr "Impossible d'ouvrir la base de données" -#: src/controller/KissCount.cpp:387 +#: src/controller/KissCount.cpp:362 msgid "Unexpected" msgstr "Exceptionnel" @@ -582,7 +582,7 @@ msgstr "Utilisateur" #: src/view/UsersDialog.cpp:39 #: src/view/UsersDialog.cpp:120 -#: src/view/PreferencesPanel.cpp:775 +#: src/view/PreferencesPanel.cpp:789 msgid "User " msgstr "Utilisateur " @@ -590,19 +590,23 @@ msgstr "Utilisateur " msgid "Users" msgstr "Utilisateurs" -#: src/view/grid/GridAccount.cpp:1044 +#: src/view/PreferencesPanel.cpp:199 +msgid "Virtual" +msgstr "Virtuel" + +#: src/view/grid/GridAccount.cpp:1048 msgid "Warning" msgstr "Attention" -#: src/view/PreferencesPanel.cpp:432 +#: src/view/PreferencesPanel.cpp:445 msgid "Wich account will replace this one ?" msgstr "Quel compte va remplacer celui-ci ?" -#: src/view/PreferencesPanel.cpp:692 +#: src/view/PreferencesPanel.cpp:706 msgid "Wich category will replace this one ?" msgstr "Quelle catégorie va remplacer celle-ci" -#: src/view/grid/GridAccount.cpp:1044 +#: src/view/grid/GridAccount.cpp:1048 msgid "You made a debit on a blocked account" msgstr "Vous avez effectué une opération de débit sur un compte bloqué" diff --git a/ressources/po/kisscount.pot b/ressources/po/kisscount.pot index cf1ed36..7c9e767 100644 --- a/ressources/po/kisscount.pot +++ b/ressources/po/kisscount.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-13 19:27+0100\n" +"POT-Creation-Date: 2011-02-15 19:15+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,13 +17,13 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/view/StatsPanel.cpp:358 src/view/PreferencesPanel.cpp:817 +#: src/view/StatsPanel.cpp:358 src/view/PreferencesPanel.cpp:831 msgid " - " msgstr "" -#: src/view/UsersDialog.cpp:120 src/view/PreferencesPanel.cpp:482 -#: src/view/PreferencesPanel.cpp:502 src/view/PreferencesPanel.cpp:712 -#: src/view/PreferencesPanel.cpp:731 src/view/PreferencesPanel.cpp:775 +#: src/view/UsersDialog.cpp:120 src/view/PreferencesPanel.cpp:495 +#: src/view/PreferencesPanel.cpp:515 src/view/PreferencesPanel.cpp:726 +#: src/view/PreferencesPanel.cpp:745 src/view/PreferencesPanel.cpp:789 msgid " already exists" msgstr "" @@ -35,11 +35,11 @@ msgstr "" msgid " not found, aborting" msgstr "" -#: src/view/AccountPanel.cpp:757 +#: src/view/AccountPanel.cpp:766 msgid " operations ?" msgstr "" -#: src/view/PreferencesPanel.cpp:824 +#: src/view/PreferencesPanel.cpp:838 msgid " profil ?" msgstr "" @@ -55,11 +55,11 @@ msgstr "" msgid "Account" msgstr "" -#: src/view/PreferencesPanel.cpp:482 src/view/PreferencesPanel.cpp:502 +#: src/view/PreferencesPanel.cpp:495 src/view/PreferencesPanel.cpp:515 msgid "Account " msgstr "" -#: src/controller/KissCount.cpp:363 +#: src/controller/KissCount.cpp:370 msgid "Account 1" msgstr "" @@ -83,7 +83,7 @@ msgstr "" msgid "Amount to" msgstr "" -#: src/view/PreferencesPanel.cpp:824 src/view/AccountPanel.cpp:752 +#: src/view/PreferencesPanel.cpp:838 src/view/AccountPanel.cpp:761 msgid "Are you sure want to delete " msgstr "" @@ -91,15 +91,15 @@ msgstr "" msgid "Are you sure want to delete : \n" msgstr "" -#: src/view/PreferencesPanel.cpp:361 +#: src/view/PreferencesPanel.cpp:368 msgid "Ascending" msgstr "" -#: src/view/PreferencesPanel.cpp:285 +#: src/view/PreferencesPanel.cpp:292 msgid "Background color" msgstr "" -#: src/view/PreferencesPanel.cpp:199 +#: src/view/PreferencesPanel.cpp:200 msgid "Blocked" msgstr "" @@ -108,11 +108,11 @@ msgstr "" msgid "Cancel" msgstr "" -#: src/view/grid/GridAccount.cpp:1267 src/view/grid/GridAccount.cpp:1274 +#: src/view/grid/GridAccount.cpp:1271 src/view/grid/GridAccount.cpp:1278 msgid "Cannot group these operations" msgstr "" -#: src/view/grid/GridAccount.cpp:1393 src/view/grid/GridAccount.cpp:1399 +#: src/view/grid/GridAccount.cpp:1397 src/view/grid/GridAccount.cpp:1403 msgid "Cannot ungroup these operations" msgstr "" @@ -124,7 +124,7 @@ msgstr "" msgid "Category" msgstr "" -#: src/view/PreferencesPanel.cpp:712 src/view/PreferencesPanel.cpp:731 +#: src/view/PreferencesPanel.cpp:726 src/view/PreferencesPanel.cpp:745 msgid "Category " msgstr "" @@ -208,12 +208,12 @@ msgstr "" msgid "Default" msgstr "" -#: src/view/PreferencesPanel.cpp:200 src/view/PreferencesPanel.cpp:288 -#: src/view/AccountPanel.cpp:611 +#: src/view/PreferencesPanel.cpp:201 src/view/PreferencesPanel.cpp:295 +#: src/view/AccountPanel.cpp:620 msgid "Delete" msgstr "" -#: src/view/PreferencesPanel.cpp:362 +#: src/view/PreferencesPanel.cpp:369 msgid "Descending" msgstr "" @@ -228,13 +228,13 @@ msgstr "" #: src/view/UsersDialog.cpp:90 src/view/UsersDialog.cpp:120 #: src/view/SearchPanel.cpp:179 src/view/SearchPanel.cpp:189 #: src/view/SearchPanel.cpp:203 src/view/SearchPanel.cpp:214 -#: src/view/PreferencesPanel.cpp:422 src/view/PreferencesPanel.cpp:482 -#: src/view/PreferencesPanel.cpp:502 src/view/PreferencesPanel.cpp:712 -#: src/view/PreferencesPanel.cpp:731 src/view/PreferencesPanel.cpp:769 -#: src/view/PreferencesPanel.cpp:775 src/view/PasswordDialog.cpp:72 -#: src/view/PasswordDialog.cpp:78 src/view/AccountPanel.cpp:748 -#: src/view/grid/GridAccount.cpp:1267 src/view/grid/GridAccount.cpp:1274 -#: src/view/grid/GridAccount.cpp:1393 src/view/grid/GridAccount.cpp:1399 +#: src/view/PreferencesPanel.cpp:435 src/view/PreferencesPanel.cpp:495 +#: src/view/PreferencesPanel.cpp:515 src/view/PreferencesPanel.cpp:726 +#: src/view/PreferencesPanel.cpp:745 src/view/PreferencesPanel.cpp:783 +#: src/view/PreferencesPanel.cpp:789 src/view/PasswordDialog.cpp:72 +#: src/view/PasswordDialog.cpp:78 src/view/AccountPanel.cpp:757 +#: src/view/grid/GridAccount.cpp:1271 src/view/grid/GridAccount.cpp:1278 +#: src/view/grid/GridAccount.cpp:1397 src/view/grid/GridAccount.cpp:1403 #: src/view/grid/wxGridCellFormulaEditor.cpp:69 src/model/Database.cpp:42 #: src/model/Database.cpp:49 src/model/Database.cpp:67 #: src/model/Database.cpp:96 src/model/Database.cpp:104 @@ -251,15 +251,15 @@ msgid "Final value" msgstr "" #: src/view/SearchPanel.cpp:84 src/view/grid/GridAccount.cpp:329 -#: src/controller/KissCount.cpp:379 +#: src/controller/KissCount.cpp:361 msgid "Fix" msgstr "" -#: src/view/PreferencesPanel.cpp:287 +#: src/view/PreferencesPanel.cpp:294 msgid "Font" msgstr "" -#: src/view/PreferencesPanel.cpp:286 +#: src/view/PreferencesPanel.cpp:293 msgid "Foreground color" msgstr "" @@ -271,11 +271,11 @@ msgstr "" msgid "From " msgstr "" -#: src/view/GenerateDialog.cpp:31 src/view/AccountPanel.cpp:608 +#: src/view/GenerateDialog.cpp:31 src/view/AccountPanel.cpp:617 msgid "Generate month" msgstr "" -#: src/controller/KissCount.cpp:381 +#: src/controller/KissCount.cpp:361 msgid "Groceries" msgstr "" @@ -283,7 +283,7 @@ msgstr "" msgid "Group" msgstr "" -#: src/controller/KissCount.cpp:383 +#: src/controller/KissCount.cpp:361 msgid "Hobbies" msgstr "" @@ -311,7 +311,7 @@ msgstr "" msgid "Invalid formula !" msgstr "" -#: src/view/PreferencesPanel.cpp:769 +#: src/view/PreferencesPanel.cpp:783 msgid "Invalid name" msgstr "" @@ -327,11 +327,11 @@ msgstr "" msgid "Invalide date range" msgstr "" -#: src/view/PreferencesPanel.cpp:422 +#: src/view/PreferencesPanel.cpp:435 msgid "It must be at least one account !" msgstr "" -#: src/view/AccountPanel.cpp:748 +#: src/view/AccountPanel.cpp:757 msgid "It must be at least one month !" msgstr "" @@ -339,8 +339,8 @@ msgstr "" msgid "Kill me" msgstr "" -#: src/view/StatsPanel.cpp:377 src/view/PreferencesPanel.cpp:809 -#: src/view/PreferencesPanel.cpp:812 src/model/Database_Update.cpp:127 +#: src/view/StatsPanel.cpp:377 src/view/PreferencesPanel.cpp:823 +#: src/view/PreferencesPanel.cpp:826 src/model/Database_Update.cpp:135 msgid "KissCount" msgstr "" @@ -348,20 +348,20 @@ msgstr "" msgid "Language" msgstr "" -#: src/view/PreferencesPanel.cpp:812 +#: src/view/PreferencesPanel.cpp:826 msgid "Language not changed" msgstr "" -#: src/view/PreferencesPanel.cpp:809 +#: src/view/PreferencesPanel.cpp:823 msgid "Language successfully changed, please go to another panel" msgstr "" #: src/view/PreferencesPanel.cpp:72 src/view/PreferencesPanel.cpp:196 -#: src/view/PreferencesPanel.cpp:284 +#: src/view/PreferencesPanel.cpp:291 msgid "Name" msgstr "" -#: src/view/PreferencesPanel.cpp:781 +#: src/view/PreferencesPanel.cpp:795 msgid "Name changed" msgstr "" @@ -388,7 +388,7 @@ msgid "Non fix" msgstr "" #: src/view/SearchPanel.cpp:304 src/view/SearchPanel.cpp:346 -#: src/view/PreferencesPanel.cpp:427 src/view/PreferencesPanel.cpp:687 +#: src/view/PreferencesPanel.cpp:440 src/view/PreferencesPanel.cpp:701 msgid "None" msgstr "" @@ -409,8 +409,8 @@ msgstr "" msgid "Old password " msgstr "" -#: src/controller/KissCount.cpp:385 -msgid "Operating exepense" +#: src/controller/KissCount.cpp:361 +msgid "Operating expense" msgstr "" #: src/view/PreferencesPanel.cpp:63 @@ -421,7 +421,7 @@ msgstr "" msgid "Operations" msgstr "" -#: src/controller/KissCount.cpp:389 +#: src/controller/KissCount.cpp:362 msgid "Other" msgstr "" @@ -448,8 +448,8 @@ msgstr "" msgid "Please retype new password" msgstr "" -#: src/view/PreferencesPanel.cpp:184 src/view/PreferencesPanel.cpp:783 -#: src/view/PreferencesPanel.cpp:817 +#: src/view/PreferencesPanel.cpp:184 src/view/PreferencesPanel.cpp:797 +#: src/view/PreferencesPanel.cpp:831 msgid "Preferences" msgstr "" @@ -507,7 +507,7 @@ msgstr "" msgid "Unable to open Database" msgstr "" -#: src/controller/KissCount.cpp:387 +#: src/controller/KissCount.cpp:362 msgid "Unexpected" msgstr "" @@ -521,7 +521,7 @@ msgid "User" msgstr "" #: src/view/UsersDialog.cpp:39 src/view/UsersDialog.cpp:120 -#: src/view/PreferencesPanel.cpp:775 +#: src/view/PreferencesPanel.cpp:789 msgid "User " msgstr "" @@ -529,19 +529,23 @@ msgstr "" msgid "Users" msgstr "" -#: src/view/grid/GridAccount.cpp:1044 +#: src/view/PreferencesPanel.cpp:199 +msgid "Virtual" +msgstr "" + +#: src/view/grid/GridAccount.cpp:1048 msgid "Warning" msgstr "" -#: src/view/PreferencesPanel.cpp:432 +#: src/view/PreferencesPanel.cpp:445 msgid "Wich account will replace this one ?" msgstr "" -#: src/view/PreferencesPanel.cpp:692 +#: src/view/PreferencesPanel.cpp:706 msgid "Wich category will replace this one ?" msgstr "" -#: src/view/grid/GridAccount.cpp:1044 +#: src/view/grid/GridAccount.cpp:1048 msgid "You made a debit on a blocked account" msgstr "" diff --git a/src/controller/KissCount.cpp b/src/controller/KissCount.cpp index 53f3bae..75648dc 100644 --- a/src/controller/KissCount.cpp +++ b/src/controller/KissCount.cpp @@ -356,6 +356,12 @@ void KissCount::ChangeName(const wxString& name) _user->_name = name; } +// To enable translation during xgettext +wxString default_cats[] = { + _("Fix"), _("Groceries"), _("Hobbies"), _("Operating expense"), + _("Unexpected"), _("Other") +}; + void KissCount::NewUser(const wxString& name) { wxDateTime curDate; @@ -377,17 +383,17 @@ void KissCount::NewUser(const wxString& name) AddAccount(ac); - cat.parent = wxT("0") ; cat.name = _("Fix") ; cat.backcolor = OWN_YELLOW ; cat.forecolor = *wxBLACK; cat.fix_cost = true; + cat.parent = wxT("0") ; cat.name = wxT("Fix") ; cat.backcolor = OWN_YELLOW ; cat.forecolor = *wxBLACK; cat.fix_cost = true; AddCategory(cat); - cat.parent = wxT("0") ; cat.name = _("Groceries") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false; + cat.parent = wxT("0") ; cat.name = wxT("Groceries") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false; AddCategory(cat); - cat.parent = wxT("0") ; cat.name = _("Hobbies") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false; + cat.parent = wxT("0") ; cat.name = wxT("Hobbies") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false; AddCategory(cat); - cat.parent = wxT("0") ; cat.name = _("Operating exepense") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false; + cat.parent = wxT("0") ; cat.name = wxT("Operating exepense") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false; AddCategory(cat); - cat.parent = wxT("0") ; cat.name = _("Unexpected") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false; + cat.parent = wxT("0") ; cat.name = wxT("Unexpected") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false; AddCategory(cat); - cat.parent = wxT("0") ; cat.name = _("Other") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false; + cat.parent = wxT("0") ; cat.name = wxT("Other") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false; AddCategory(cat); SetOperationOrder(wxT("ASC")); diff --git a/src/model/Database.cpp b/src/model/Database.cpp index 6b5e8a9..1821a23 100644 --- a/src/model/Database.cpp +++ b/src/model/Database.cpp @@ -1331,7 +1331,7 @@ std::vector* Database::Search(User* user, wxString* description, wxDa ESCAPE_CHARS(desc); if (wildcards) - req += wxT("description LIKE '%") + desc + wxT("%'"); + req += wxT("UPPER(description) LIKE UPPER('%") + desc + wxT("%')"); else req += wxT("description=\"") + desc + wxT("\""); firstCond = true; diff --git a/src/view/AccountPanel.cpp b/src/view/AccountPanel.cpp index 4e8ebf0..abe6a24 100644 --- a/src/view/AccountPanel.cpp +++ b/src/view/AccountPanel.cpp @@ -77,7 +77,7 @@ AccountPanel::AccountPanel(KissCount* kiss, wxUI *parent) : KissPanel(kiss, pare categoryIt != user->_categories.end(); categoryIt++, i++) { - _categories[i] = categoryIt->name ; + _categories[i] = wxGetTranslation(categoryIt->name) ; _categoriesIndexes[categoryIt->name] = i; } diff --git a/src/view/PreferencesPanel.cpp b/src/view/PreferencesPanel.cpp index 6013280..3ee4c5b 100644 --- a/src/view/PreferencesPanel.cpp +++ b/src/view/PreferencesPanel.cpp @@ -314,7 +314,7 @@ void PreferencesPanel::AddCategory(int line, Category cat) if (cat.id != wxT("0")) { - _categoriesGrid->SetCellValue(line, CATEGORY_NAME, cat.name); + _categoriesGrid->SetCellValue(line, CATEGORY_NAME, wxGetTranslation(cat.name)); SET_ROW_COLOR(line, cat.backcolor, cat.forecolor); if (line) { diff --git a/src/view/grid/GridAccount.cpp b/src/view/grid/GridAccount.cpp index ca836f5..c19be25 100644 --- a/src/view/grid/GridAccount.cpp +++ b/src/view/grid/GridAccount.cpp @@ -352,7 +352,7 @@ void GridAccount::InsertOperation(User* user, Operation& op, int line, bool fix, if (!op.meta) SetCellValue(line, ACCOUNT, user->GetAccountName(op.account)); if (!fix && !op.meta) - SetCellValue(line, CATEGORY, cat.name); + SetCellValue(line, CATEGORY, wxGetTranslation(cat.name)); SetCellRenderer(line, OP_DELETE, new wxGridCellBoolRenderer ()); SetCellEditor(line, OP_DELETE, new wxGridCellBoolEditor ()); SetCellRenderer(line, CHECKED, new wxGridCellBoolRenderer ());