diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
commit | cc29364f06178f8f6b457384f2ec37a042bd9d43 (patch) | |
tree | 7c77a3184c698bbf9d98cef09fb1ba8124daceba /korganizer/plugins/hebrew | |
parent | 4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff) | |
download | tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip |
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'korganizer/plugins/hebrew')
-rw-r--r-- | korganizer/plugins/hebrew/hebrew.cpp | 8 | ||||
-rw-r--r-- | korganizer/plugins/hebrew/hebrew.desktop | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp index 9fb0f2fbf..8a9f37bd4 100644 --- a/korganizer/plugins/hebrew/hebrew.cpp +++ b/korganizer/plugins/hebrew/hebrew.cpp @@ -55,7 +55,7 @@ TQString Hebrew::shortText(const TQDate & date) Holiday::ParshaP = config.readBoolEntry("Parsha", true); Holiday::CholP = config.readBoolEntry("Chol_HaMoed", true); Holiday::OmerP = config.readBoolEntry("Omer", true); - TQString *label_text = new TQString(); + TQString label_text; int day = date.day(); int month = date.month(); @@ -81,7 +81,7 @@ TQString Hebrew::shortText(const TQDate & date) hebrew_day_number, hebrew_year); KCalendarSystem *cal = KCalendarSystemFactory::create("hebrew"); - *label_text = TQString("%1 %2").arg(cal->dayString(date, false)) + label_text = TQString("%1 %2").arg(cal->dayString(date, false)) .arg(cal->monthName(date)); if (holidays.count()) @@ -90,11 +90,11 @@ TQString Hebrew::shortText(const TQDate & date) for (int h = 0; h <= count; ++h) { - *label_text += "\n" + holidays[h]; + label_text += "\n" + holidays[h]; } } - return *label_text; + return label_text; } TQString Hebrew::info() diff --git a/korganizer/plugins/hebrew/hebrew.desktop b/korganizer/plugins/hebrew/hebrew.desktop index 86c88328d..dc67c2eba 100644 --- a/korganizer/plugins/hebrew/hebrew.desktop +++ b/korganizer/plugins/hebrew/hebrew.desktop @@ -23,7 +23,6 @@ Name[hu]=Bővítőmodul a zsidó naptár kezeléséhez Name[is]=Gyðinga dagatalsíforrit Name[it]=Plugin calendario ebraico Name[ja]=ユダヤ歴カレンダープラグイン -Name[ka]=ებრაული კალენდრის მოდული Name[kk]=Яһуди күнтізбесінің модулі Name[km]=កម្មវិធីជំនួយប្រតិទិន Jewish Name[lt]=Žydų kalendoriaus priedas @@ -70,7 +69,6 @@ Comment[hu]=A KOrganizer dátumait kiírja a hagyományos zsidó naptár szerint Comment[is]=Sýna alla dagsetningar í KOrganizer sem eru einnig í dagatali gyðinga. Comment[it]=Mostra tutte le date in korganizer secondo il calendario ebraico. Comment[ja]=korganizer のすべての日付をユダヤ暦でも表示します。 -Comment[ka]=ყველა თარიღს ებრაული კალენდრის მიხედვითაც აჩვენებს Comment[kk]=Яһуди күнтізбе күндерін korganizer-де көрсететін модулі. Comment[km]=បង្ហាញកាលបរិច្ឆេទទាំងអស់ក្នុង korganizer នៅក្នុងប្រព័ន្ធប្រតិទិន Jewish ។ Comment[lt]=Rodo visas dienas kalendoriuje taip pat ir žydų kalendoriaus sistema. |