diff options
| -rw-r--r-- | calendar/gnome/README | 7 | ||||
| -rw-r--r-- | calendar/kde/kdelibs/kdecore/date/kcalendarsystemindic.cpp | 56 | ||||
| -rw-r--r-- | calendar/kde/kdelibs/kdecore/tests/kcalendartest.cpp | 17 |
3 files changed, 45 insertions, 35 deletions
diff --git a/calendar/gnome/README b/calendar/gnome/README new file mode 100644 index 0000000..4c6a77e --- /dev/null +++ b/calendar/gnome/README @@ -0,0 +1,7 @@ +We need to discuss this with kde-core team and find a way to have GNOME and other desktops use the calendar without a full dependancy on kdelibs. + +Some options are + +1) Move calendar to a separate library +2) Integrate it with any libraries that every one depends like glibc +3) Keep a local copy of date directory - not a good idea diff --git a/calendar/kde/kdelibs/kdecore/date/kcalendarsystemindic.cpp b/calendar/kde/kdelibs/kdecore/date/kcalendarsystemindic.cpp index 56d2feb..8028d47 100644 --- a/calendar/kde/kdelibs/kdecore/date/kcalendarsystemindic.cpp +++ b/calendar/kde/kdelibs/kdecore/date/kcalendarsystemindic.cpp @@ -160,13 +160,15 @@ int KCalendarSystemIndic::year( const QDate &date ) const int saka_year, saka_start=22; saka_year = KCalendarSystem::year( date ) - KCalendarSystemSaka::get_era_start(); - if (KCalendarSystem::isLeapYear(date.year())) { + // kDebug() <<"saka_year" << saka_year; + if (KCalendarSystemIndic::isLeapYear(saka_year)) { saka_start=21; } if ((date.month() <=3) && (date.day() < saka_start)) { --saka_year; } + // kDebug() <<"saka_year just before return" << saka_year; return saka_year; } @@ -337,12 +339,14 @@ int KCalendarSystemIndic::weekNumber( const QDate &date, int * yearNum ) const bool KCalendarSystemIndic::isLeapYear( int year ) const { - return QDate::isLeapYear( year ); + // kDebug() << "year" << year; + return QDate::isLeapYear( year + 78); } bool KCalendarSystemIndic::isLeapYear( const QDate &date ) const { - return KCalendarSystem::isLeapYear( date ); + int year = KCalendarSystemIndic::year(date); + return KCalendarSystemIndic::isLeapYear( year ); } QString KCalendarSystemIndic::monthName( int month, int year, MonthNameFormat format ) const @@ -352,29 +356,29 @@ QString KCalendarSystemIndic::monthName( int month, int year, MonthNameFormat fo if ( format == ShortNamePossessive ) { switch ( month ) { case 1: - return ki18nc( "of Chaitra", "of Chaitra" ).toString( locale() ); + return ki18nc( "of Chaitra", "of Chai" ).toString( locale() ); case 2: - return ki18nc( "of Vaisakha", "of Vaisakha" ).toString( locale() ); + return ki18nc( "of Vaisakha", "of Vai" ).toString( locale() ); case 3: - return ki18nc( "of Jyaistha", "of Jyaistha" ).toString( locale() ); + return ki18nc( "of Jyaistha", "of Jyai" ).toString( locale() ); case 4: - return ki18nc( "of Asadha", "of Asadha" ).toString( locale() ); + return ki18nc( "of Asadha", "of Asa" ).toString( locale() ); case 5: - return ki18nc( "of Sravana", "of Sravana" ).toString( locale() ); + return ki18nc( "of Sravana", "of Sra" ).toString( locale() ); case 6: - return ki18nc( "of Bhadra", "of Bhadra" ).toString( locale() ); + return ki18nc( "of Bhadra", "of Bha" ).toString( locale() ); case 7: - return ki18nc( "of Asvina", "of Asvina" ).toString( locale() ); + return ki18nc( "of Asvina", "of Asvi" ).toString( locale() ); case 8: - return ki18nc( "of Kartika", "of Kartika" ).toString( locale() ); + return ki18nc( "of Kartika", "of Ka" ).toString( locale() ); case 9: - return ki18nc( "of Agrahayana", "of Agrahayana" ).toString( locale() ); + return ki18nc( "of Agrahayana", "of Agra" ).toString( locale() ); case 10: - return ki18nc( "of Pausa", "of Pausa" ).toString( locale() ); + return ki18nc( "of Pausa", "of Pau" ).toString( locale() ); case 11: - return ki18nc( "of Magha", "of Magha" ).toString( locale() ); + return ki18nc( "of Magha", "of Ma" ).toString( locale() ); case 12: - return ki18nc( "of Phalguna", "of Phalguna" ).toString( locale() ); + return ki18nc( "of Phalguna", "of Pha" ).toString( locale() ); default: return QString(); } @@ -428,15 +432,15 @@ QString KCalendarSystemIndic::monthName( int month, int year, MonthNameFormat fo case 7: return ki18nc( "Asvina", "Asvi" ).toString( locale() ); case 8: - return ki18nc( "Kartika", "Kar" ).toString( locale() ); + return ki18nc( "Kartika", "Ka" ).toString( locale() ); case 9: return ki18nc( "Agrahayana", "Agra" ).toString( locale() ); case 10: - return ki18nc( "Pausa", "Pausha" ).toString( locale() ); + return ki18nc( "Pausa", "Pau" ).toString( locale() ); case 11: - return ki18nc( "Magha", "Magha" ).toString( locale() ); + return ki18nc( "Magha", "Ma" ).toString( locale() ); case 12: - return ki18nc( "Phalguna", "Phal" ).toString( locale() ); + return ki18nc( "Phalguna", "Pha" ).toString( locale() ); default: return QString(); } @@ -483,13 +487,13 @@ QString KCalendarSystemIndic::weekDayName( int weekDay, WeekDayNameFormat format { if ( format == ShortDayName ) { switch ( weekDay ) { - case 1: return ki18nc( "Somvar", "Som" ).toString( locale() ); - case 2: return ki18nc( "Mangalvar", "Mangal" ).toString( locale() ); - case 3: return ki18nc( "Budhavar", "Budha" ).toString( locale() ); - case 4: return ki18nc( "Brihaspativar", "Briha" ).toString( locale() ); - case 5: return ki18nc( "Shukravar", "Shukra" ).toString( locale() ); - case 6: return ki18nc( "Shanivar", "Shani" ).toString( locale() ); - case 7: return ki18nc( "Ravivar", "Ravi" ).toString( locale() ); + case 1: return ki18nc( "Somvar", "So" ).toString( locale() ); + case 2: return ki18nc( "Mangalvar", "Ma" ).toString( locale() ); + case 3: return ki18nc( "Budhavar", "Bu" ).toString( locale() ); + case 4: return ki18nc( "Brihaspativar", "Bri" ).toString( locale() ); + case 5: return ki18nc( "Shukravar", "Shu" ).toString( locale() ); + case 6: return ki18nc( "Shanivar", "Sha" ).toString( locale() ); + case 7: return ki18nc( "Ravivar", "Ra" ).toString( locale() ); default: return QString(); } } diff --git a/calendar/kde/kdelibs/kdecore/tests/kcalendartest.cpp b/calendar/kde/kdelibs/kdecore/tests/kcalendartest.cpp index 32d5a6a..cea8f1e 100644 --- a/calendar/kde/kdelibs/kdecore/tests/kcalendartest.cpp +++ b/calendar/kde/kdelibs/kdecore/tests/kcalendartest.cpp @@ -319,29 +319,28 @@ void KCalendarTest::testIndicBasic() testValid( calendar, 10000, 13, 32, QDate( 1, 1, 1 ) ); - QCOMPARE( calendar->isLeapYear( 1386 ), false ); - QCOMPARE( calendar->isLeapYear( 1387 ), true ); + QCOMPARE( calendar->isLeapYear( 1929 ), false ); + QCOMPARE( calendar->isLeapYear( 1930 ), true ); QCOMPARE( calendar->isLeapYear( QDate( 2008, 1, 1 ) ), false ); - QEXPECT_FAIL("", "Not working right, 2009-01-01 should be 1387, verify", Continue); QCOMPARE( calendar->isLeapYear( QDate( 2009, 1, 1 ) ), true ); QCOMPARE( calendar->daysInWeek( QDate( 2007, 1, 1 ) ), 7 ); QCOMPARE( calendar->monthsInYear( QDate( 2007, 1, 1 ) ), 12 ); - testYear( calendar, QDate( 2005, 8, 31 ), 1384, QString("84"), QString("1384") ); + testYear( calendar, QDate( 2005, 8, 31 ), 1927, QString("27"), QString("1927") ); testMonth( calendar, QDate( 2005, 8, 31 ), 6, QString("6"), QString("06") ); testDay( calendar, QDate( 2005, 8, 31 ), 9, QString("9"), QString("09") ); testWeekDayName( calendar, 3, QDate( 2005, 8, 31 ), - QString("4sh"), QString("Chahar shanbe") ); - testMonthName( calendar, 6, 1384, QDate( 2005, 8, 31 ), - QString("Sha"), QString("Shahrivar"), - QString("of Sha"), QString("of Shahrivar") ); + QString("Bu"), QString("Budhavar") ); + testMonthName( calendar, 6, 1927, QDate( 2005, 8, 31 ), + QString("Bha"), QString("Bhadra"), + QString("of Bha"), QString("of Bhadra") ); QCOMPARE( calendar->monthsInYear( QDate( 2005, 8, 31 ) ), 12 ); QCOMPARE( calendar->weekStartDay(), 1 ); - QCOMPARE( calendar->weekDayOfPray(), 5 ); + QCOMPARE( calendar->weekDayOfPray(), 7 ); QCOMPARE( calendar->isProleptic(), false ); QCOMPARE( calendar->isLunar(), false ); |