diff --git a/lib/modules/Calendar.pmod/Austrian.pmod b/lib/modules/Calendar.pmod/Austrian.pmod index 216139e91bcd13c9dab722b6ca239bc9e29f965c..d001c27a6d9d12f7d2a09dbe41de6c7408e83aff 100644 --- a/lib/modules/Calendar.pmod/Austrian.pmod +++ b/lib/modules/Calendar.pmod/Austrian.pmod @@ -1,36 +1,20 @@ -// by Martin Baehr <mbaehr@email.archlab.tuwien.ac.at> +//! +//! module Calendar +//! submodule Austrian +//! +//! Same as the ISO calendar, +//! but with austrian as the default language. +//! +//! This calendar exist only for backwards compatible +//! purposes. +//! inherit Calendar.ISO:ISO; -void create() -{ - month_names= - ({"j�nner","feber","m�rz","april","mai","juni","juli","august", - "september","oktober","november","dezember"}); - - week_day_names= - ({"montag","dienstag","mittwoch","donnerstag", - "freitag","samstag","sonntag"}); -} - -class Week -{ - inherit ISO::Week; - - string name() - { - return "w"+(string)this->number(); - } -} +import "."; +inherit ISO:ISO; -class Year +private static mixed __initstuff=lambda() { - inherit ISO::Year; - - string name() - { - if (this->number()<=0) - return (string)(1-this->number())+" v. Chr."; - return (string)this->number(); - } -} + default_rules=default_rules->set_language("austrian"); +}(); diff --git a/lib/modules/Calendar.pmod/CHANGES b/lib/modules/Calendar.pmod/CHANGES index 10afe847fb5f8b14ff0ebc0daa96bc815fe79066..5518d0d60b035074cc1e543ab2a804aa1993059b 100644 --- a/lib/modules/Calendar.pmod/CHANGES +++ b/lib/modules/Calendar.pmod/CHANGES @@ -174,3 +174,19 @@ Note which should solve the problem better. +================================================================ + +Depricated and removed: + + Calendar.Swedish and Calendar.Austrian is to be + replaced by the language rules. Those still exist + for backwards compatibility issues. + + Orthodox is removed; it was based on something + that never was accepted. The Orthodox church still + uses the julian calendar to calculate the holidays; + but the holidays are better calculated using the + Events sub-module. + +================================================================ + diff --git a/lib/modules/Calendar.pmod/Orthodox.pmod b/lib/modules/Calendar.pmod/Orthodox.pmod deleted file mode 100644 index faa7de36e9f5f085cd08301914476fcda1d0969c..0000000000000000000000000000000000000000 --- a/lib/modules/Calendar.pmod/Orthodox.pmod +++ /dev/null @@ -1,25 +0,0 @@ -// by Mirar - -inherit Calendar.Gregorian : christ; - -class Year -{ - inherit Calendar.Gregorian.Year; - - int leap() // tack, hubbe... :-) - { - switch(y%900) - { - case 0: - case 100: - case 300: - case 400: - case 500: - case 700: - case 800: return 0; - case 200: - case 600: return 1; - default: return !(y%4); - } - } -}; diff --git a/lib/modules/Calendar.pmod/Swedish.pmod b/lib/modules/Calendar.pmod/Swedish.pmod index 39a9dd88a553eb1d7b78800c2907fce9f533aba7..4226cb5cdf13c728fed4ae2016dd9dbfa9a36db6 100644 --- a/lib/modules/Calendar.pmod/Swedish.pmod +++ b/lib/modules/Calendar.pmod/Swedish.pmod @@ -3,8 +3,7 @@ //! submodule Swedish //! //! Same as the ISO calendar, -//! but with swedish namedays added, and -//! swedish is the default language. +//! but with swedish as the default language. //! //! This calendar exist only for backwards compatible //! purposes.