-rw-r--r-- | microkde/kdecore/klocale.cpp | 4 | ||||
-rw-r--r-- | microkde/kdecore/klocale.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp index 673d845..3674f28 100644 --- a/microkde/kdecore/klocale.cpp +++ b/microkde/kdecore/klocale.cpp | |||
@@ -143,48 +143,52 @@ void KLocale::setWeekStartMonday( bool b ) | |||
143 | 143 | ||
144 | KLocale::IntDateFormat KLocale::getIntDateFormat( ) | 144 | KLocale::IntDateFormat KLocale::getIntDateFormat( ) |
145 | { | 145 | { |
146 | return mIntDateFormat; | 146 | return mIntDateFormat; |
147 | 147 | ||
148 | } | 148 | } |
149 | void KLocale::setIntDateFormat( KLocale::IntDateFormat i ) | 149 | void KLocale::setIntDateFormat( KLocale::IntDateFormat i ) |
150 | { | 150 | { |
151 | mIntDateFormat = i; | 151 | mIntDateFormat = i; |
152 | } | 152 | } |
153 | KLocale::IntDateFormat KLocale::getIntTimeFormat( ) | 153 | KLocale::IntDateFormat KLocale::getIntTimeFormat( ) |
154 | { | 154 | { |
155 | return mIntTimeFormat; | 155 | return mIntTimeFormat; |
156 | 156 | ||
157 | } | 157 | } |
158 | void KLocale::setIntTimeFormat( KLocale::IntDateFormat i ) | 158 | void KLocale::setIntTimeFormat( KLocale::IntDateFormat i ) |
159 | { | 159 | { |
160 | mIntTimeFormat = i; | 160 | mIntTimeFormat = i; |
161 | } | 161 | } |
162 | 162 | ||
163 | void KLocale::setLanguage( int i ) | 163 | void KLocale::setLanguage( int i ) |
164 | { | 164 | { |
165 | mLanguage = i; | 165 | mLanguage = i; |
166 | } | 166 | } |
167 | int KLocale::language( ) | ||
168 | { | ||
169 | return mLanguage; | ||
170 | } | ||
167 | QString KLocale::translate( const char *index ) const | 171 | QString KLocale::translate( const char *index ) const |
168 | { | 172 | { |
169 | return i18n( index ); | 173 | return i18n( index ); |
170 | } | 174 | } |
171 | 175 | ||
172 | QString KLocale::translate( const char *, const char *fallback) const | 176 | QString KLocale::translate( const char *, const char *fallback) const |
173 | { | 177 | { |
174 | return i18n( fallback ); | 178 | return i18n( fallback ); |
175 | } | 179 | } |
176 | 180 | ||
177 | QString KLocale::formatTime(const QTime &pTime, bool includeSecs, IntDateFormat intIntDateFormat) const | 181 | QString KLocale::formatTime(const QTime &pTime, bool includeSecs, IntDateFormat intIntDateFormat) const |
178 | { | 182 | { |
179 | const QString rst = timeFormat(intIntDateFormat); | 183 | const QString rst = timeFormat(intIntDateFormat); |
180 | 184 | ||
181 | // only "pm/am" here can grow, the rest shrinks, but | 185 | // only "pm/am" here can grow, the rest shrinks, but |
182 | // I'm rather safe than sorry | 186 | // I'm rather safe than sorry |
183 | QChar *buffer = new QChar[rst.length() * 3 / 2 + 30]; | 187 | QChar *buffer = new QChar[rst.length() * 3 / 2 + 30]; |
184 | 188 | ||
185 | uint index = 0; | 189 | uint index = 0; |
186 | bool escape = false; | 190 | bool escape = false; |
187 | int number = 0; | 191 | int number = 0; |
188 | 192 | ||
189 | for ( uint format_index = 0; format_index < rst.length(); format_index++ ) | 193 | for ( uint format_index = 0; format_index < rst.length(); format_index++ ) |
190 | { | 194 | { |
diff --git a/microkde/kdecore/klocale.h b/microkde/kdecore/klocale.h index be9442c..14660d6 100644 --- a/microkde/kdecore/klocale.h +++ b/microkde/kdecore/klocale.h | |||
@@ -59,48 +59,49 @@ class KLocale | |||
59 | 59 | ||
60 | bool use12Clock() const; | 60 | bool use12Clock() const; |
61 | bool weekStartsMonday() const; | 61 | bool weekStartsMonday() const; |
62 | int weekStartDay() const; | 62 | int weekStartDay() const; |
63 | 63 | ||
64 | QString weekDayName(int,bool=false) const; | 64 | QString weekDayName(int,bool=false) const; |
65 | QString monthName(int,bool=false) const; | 65 | QString monthName(int,bool=false) const; |
66 | 66 | ||
67 | QString country() const; | 67 | QString country() const; |
68 | 68 | ||
69 | QString dateFormat(IntDateFormat intIntDateFormat = Undefined) const; | 69 | QString dateFormat(IntDateFormat intIntDateFormat = Undefined) const; |
70 | QString dateFormatShort(IntDateFormat intIntDateFormat = Undefined) const; | 70 | QString dateFormatShort(IntDateFormat intIntDateFormat = Undefined) const; |
71 | QString timeFormat(IntDateFormat intIntDateFormat = Undefined) const; | 71 | QString timeFormat(IntDateFormat intIntDateFormat = Undefined) const; |
72 | 72 | ||
73 | void insertCatalogue ( const QString & ); | 73 | void insertCatalogue ( const QString & ); |
74 | 74 | ||
75 | KCalendarSystem *calendar(); | 75 | KCalendarSystem *calendar(); |
76 | void setHore24Format ( bool ); | 76 | void setHore24Format ( bool ); |
77 | void setWeekStartMonday( bool ); | 77 | void setWeekStartMonday( bool ); |
78 | void setIntDateFormat( IntDateFormat ); | 78 | void setIntDateFormat( IntDateFormat ); |
79 | void setIntTimeFormat( IntDateFormat ); | 79 | void setIntTimeFormat( IntDateFormat ); |
80 | IntDateFormat getIntDateFormat( ); | 80 | IntDateFormat getIntDateFormat( ); |
81 | IntDateFormat getIntTimeFormat( ); | 81 | IntDateFormat getIntTimeFormat( ); |
82 | void setLanguage( int ); | 82 | void setLanguage( int ); |
83 | int language(); | ||
83 | void setDateFormat( QString ); | 84 | void setDateFormat( QString ); |
84 | void setDateFormatShort( QString ); | 85 | void setDateFormatShort( QString ); |
85 | 86 | ||
86 | QString m_decimalSymbol; | 87 | QString m_decimalSymbol; |
87 | QString m_thousandsSeparator; | 88 | QString m_thousandsSeparator; |
88 | QString m_currencySymbol; | 89 | QString m_currencySymbol; |
89 | QString m_monetaryDecimalSymbol; | 90 | QString m_monetaryDecimalSymbol; |
90 | QString m_monetaryThousandsSeparator; | 91 | QString m_monetaryThousandsSeparator; |
91 | QString m_positiveSign; | 92 | QString m_positiveSign; |
92 | QString m_negativeSign; | 93 | QString m_negativeSign; |
93 | 94 | ||
94 | int timezoneOffset( QString ); | 95 | int timezoneOffset( QString ); |
95 | QStringList timeZoneList() const; | 96 | QStringList timeZoneList() const; |
96 | void setDaylightSaving( bool, int , int ); | 97 | void setDaylightSaving( bool, int , int ); |
97 | int localTimeOffset(const QDateTime &); | 98 | int localTimeOffset(const QDateTime &); |
98 | void setTimezone( const QString &timeZone , bool oddTZ); | 99 | void setTimezone( const QString &timeZone , bool oddTZ); |
99 | private: | 100 | private: |
100 | QTime readTime(const QString &str, bool seconds, bool *ok) const; | 101 | QTime readTime(const QString &str, bool seconds, bool *ok) const; |
101 | QDate readDate(const QString &str, bool shortFormat, bool *ok) const; | 102 | QDate readDate(const QString &str, bool shortFormat, bool *ok) const; |
102 | KCalendarSystem *mCalendarSystem; | 103 | KCalendarSystem *mCalendarSystem; |
103 | bool mWeekStartsMonday; | 104 | bool mWeekStartsMonday; |
104 | bool mHourF24Format; | 105 | bool mHourF24Format; |
105 | IntDateFormat mIntDateFormat; | 106 | IntDateFormat mIntDateFormat; |
106 | IntDateFormat mIntTimeFormat; | 107 | IntDateFormat mIntTimeFormat; |