> On Jan. 24, 2016, 9:02 p.m., Christian David wrote: > > kmymoney/converter/mymoneystatementreader.cpp, line 1458 > > <https://git.reviewboard.kde.org/r/126875/diff/1/?file=439594#file439594line1458> > > > > Translated strings should not be combined, as it confuses the > > translators. It is better to create two long strings using i18np() although > > this duplicates the text (which is usually bad). > > Artur Puzio wrote: > But the i18np() is for plurals. What we can do is change the previous > string only slitly to add the variable that will contain `"The transaction > dates are one day apart.<br/>"` or `""`. > > Christian David wrote: > You could use something like > > i18n("<html>KMyMoney has found a scheduled transaction which matches > an imported transaction.<br/>" > "Schedule name: <b>%1</b><br/>" > "Transaction: <i>%2 %3</i><br/>" > "Do you want KMyMoney to enter this schedule > now so that the transaction can be matched?</html>", > scheduleName, splitValue, payeeName); > > and > i18np("<html>KMyMoney has found a scheduled transaction which matches > an imported transaction.<br/>" > "Schedule name: <b>%2</b><br/>" > "Transaction: <i>%3 %4</i><br/>" > "The transaction dates are one day > apart.<br/>" > "Do you want KMyMoney to enter this schedule > now so that the transaction can be matched?</html>", > "<html>KMyMoney has found a scheduled > transaction which matches an imported transaction.<br/>" > "Schedule name: <b>%2</b><br/>" > "Transaction: <i>%3 %4</i><br/>" > "The transaction dates are %1 days > apart.<br/>" > "Do you want KMyMoney to enter this schedule > now so that the transaction can be matched?</html>", > gap ,scheduleName, splitValue, payeeName);
I think this code was transferred from kmymoney/dialogs/transactionmatcher.cpp lines 79-88, and now, here, I think it deals with matching a schedule. It's a while since I was in this area, so this could be totally wrong, but I think that in the original position, it also handled matched non-scheduled and non-imported transactions. Have you tested this capability? If so, great and I'm wrong. - Allan ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/126875/#review91536 ----------------------------------------------------------- On Jan. 24, 2016, 8:52 p.m., Artur Puzio wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/126875/ > ----------------------------------------------------------- > > (Updated Jan. 24, 2016, 8:52 p.m.) > > > Review request for KMymoney and Christian David. > > > Repository: kmymoney > > > Description > ------- > > Moved the question from `TransactionMatcher::match` to > `MyMoneyStatementReader::askUserToEnterScheduleForMatching`. > Added `MyMoneyTransaction & importedTransaction` parmeter to > `MyMoneyStatementReader::askUserToEnterScheduleForMatching`, as > `importedTransation` is required to calculate if the question from > `TransactionMatcher::match` should be shown. > > > Diffs > ----- > > kmymoney/converter/mymoneystatementreader.h > 80da2023490a99963b5ff85c8d77cf1d8b58bf2b > kmymoney/converter/mymoneystatementreader.cpp > 1634bbb37ec86d0f065a73427cd353697812c79e > kmymoney/dialogs/transactionmatcher.cpp > 7d9740411b96940ac848009218dce65ffaac061e > > Diff: https://git.reviewboard.kde.org/r/126875/diff/ > > > Testing > ------- > > Automated tests still pass, but they don't check the subject of work. > Screenshot: [link](https://imgur.com/3Veh70N) > > > Thanks, > > Artur Puzio > >