From e389423398efc3eb376eceb8d213aad2a51790c4 Mon Sep 17 00:00:00 2001
From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org>
Date: Tue, 1 Aug 2000 11:21:57 +0200
Subject: [PATCH] simplified.
Rev: lib/modules/Calendar.pmod/Austrian.pmod:1.2
Rev: lib/modules/Calendar.pmod/CHANGES:1.2
Rev: lib/modules/Calendar.pmod/Orthodox.pmod:1.2(DEAD)
Rev: lib/modules/Calendar.pmod/Swedish.pmod:1.2
---
lib/modules/Calendar.pmod/Austrian.pmod | 46 ++++++++-----------------
lib/modules/Calendar.pmod/CHANGES | 16 +++++++++
lib/modules/Calendar.pmod/Orthodox.pmod | 25 --------------
lib/modules/Calendar.pmod/Swedish.pmod | 3 +-
4 files changed, 32 insertions(+), 58 deletions(-)
delete mode 100644 lib/modules/Calendar.pmod/Orthodox.pmod
diff --git a/lib/modules/Calendar.pmod/Austrian.pmod b/lib/modules/Calendar.pmod/Austrian.pmod
index 216139e91b..d001c27a6d 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 10afe847fb..5518d0d60b 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 faa7de36e9..0000000000
--- 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 39a9dd88a5..4226cb5cdf 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.
--
GitLab