aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <[email protected]>2010-03-17 22:25:13 -0700
committerGlenn Morris <[email protected]>2010-03-17 22:25:13 -0700
commit1a355d092be234a0cb5b2cf0956a090aad7fa1a2 (patch)
treec30cd3ea50de5c0a335f00cbbef3f0b49306c0a7 /lisp
parentf8388570302aad60379a3275fa81bfe475e76252 (diff)
* calendar/cal-french.el: Convert to utf-8.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/calendar/cal-french.el21
2 files changed, 15 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e72757db8f..407d700c28 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
2010-03-18 Glenn Morris <[email protected]>
+ * calendar/cal-french.el: Convert to utf-8.
+
* files.el (interpreter-mode-alist): Use emacs-lisp-mode for
Emacs scripts.
diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index 1ee290f5aa..9b252eb3dc 100644
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -1,7 +1,8 @@
;;; cal-french.el --- calendar functions for the French Revolutionary calendar
;; Copyright (C) 1988, 1989, 1992, 1994, 1995, 1997, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; Free Software Foundation, Inc.
;; Author: Edward M. Reingold <[email protected]>
;; Maintainer: Glenn Morris <[email protected]>
@@ -40,8 +41,8 @@
"Array of month names in the French calendar.")
(defconst calendar-french-multibyte-month-name-array
- ["Vend�miaire" "Brumaire" "Frimaire" "Niv�se" "Pluvi�se" "Vent�se"
- "Germinal" "Flor�al" "Prairial" "Messidor" "Thermidor" "Fructidor"]
+ ["Vendémiaire" "Brumaire" "Frimaire" "Nivôse" "Pluviôse" "Ventôse"
+ "Germinal" "Floréal" "Prairial" "Messidor" "Thermidor" "Fructidor"]
"Array of multibyte month names in the French calendar.")
(defconst calendar-french-day-name-array
@@ -55,8 +56,8 @@
"Array of special day names in the French calendar.")
(defconst calendar-french-multibyte-special-days-array
- ["de la Vertu" "du G�nie" "du Travail" "de la Raison" "des R�compenses"
- "de la R�volution"]
+ ["de la Vertu" "du Génie" "du Travail" "de la Raison" "des Récompenses"
+ "de la Révolution"]
"Array of multibyte special day names in the French calendar.")
(defun calendar-french-accents-p ()
@@ -174,13 +175,13 @@ Defaults to today's date if DATE is not given."
(cond
((< y 1) "")
((= m 13) (format (if (calendar-french-accents-p)
- "Jour %s de l'Ann�e %d de la R�volution"
+ "Jour %s de l'Année %d de la Révolution"
"Jour %s de l'Anne'e %d de la Re'volution")
(aref (calendar-french-special-days-array) (1- d))
y))
(t (format
(if (calendar-french-accents-p)
- "%d %s an %d de la R�volution"
+ "%d %s an %d de la Révolution"
"%d %s an %d de la Re'volution")
d
(aref (calendar-french-month-name-array) (1- m))
@@ -208,7 +209,7 @@ Echo French Revolutionary date unless NOECHO is non-nil."
(year (progn
(calendar-read
(if (calendar-french-accents-p)
- "Ann�e de la R�volution (>0): "
+ "Année de la Révolution (>0): "
"Anne'e de la Re'volution (>0): ")
(lambda (x) (> x 0))
(number-to-string
@@ -264,5 +265,9 @@ Echo French Revolutionary date unless NOECHO is non-nil."
(provide 'cal-french)
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
;; arch-tag: 7e8045a3-8609-46b5-9cde-cf40ce541cf9
;;; cal-french.el ends here