cl-l10n-cvs

Download

cl-l10n-cvs@common-lisp.net

December 2004

1 participants
12 discussions

[cl-l10n-cvs] CVS update: cl-l10n/doc/cl-l10n.texi
by sross＠common-lisp.net 01 Dec '04

01 Dec '04

Update of /project/cl-l10n/cvsroot/cl-l10n/doc In directory common-lisp.net:/tmp/cvs-serv28413/doc Modified Files: cl-l10n.texi Log Message: Changelog 2004-12-01 Date: Wed Dec 1 12:48:46 2004 Author: sross Index: cl-l10n/doc/cl-l10n.texi diff -u cl-l10n/doc/cl-l10n.texi:1.1.1.1 cl-l10n/doc/cl-l10n.texi:1.2 --- cl-l10n/doc/cl-l10n.texi:1.1.1.1 Mon Nov 29 10:59:09 2004 +++ cl-l10n/doc/cl-l10n.texi Wed Dec 1 12:48:46 2004 @@ -60,6 +60,7 @@ * Introduction: Introduction * Getting Started: Getting Started * API: API +* I18N: I18N * Notes: Notes * Credits: Credits * Index:: @@ -128,9 +129,12 @@ @section Installing Once downloaded and symlinked you can load CL-L10N at anytime using -@lisp (asdf:oos 'asdf:load-op :cl-l10n) @end lisp +@code{(asdf:oos 'asdf:load-op :cl-l10n)} This will compile CL-L10n the first time it is loaded. +Once installed run @code{(asdf:oos 'asdf:test-op :cl-l10n)} to test +the package. If any tests fail please send an email to one of the +mailing lists. @node API @chapter API @@ -194,8 +198,7 @@ Example (assuming *locale* is en_ZA) @lisp (format t "~:/cl-l10n:format-number/" 1002932) -1,002,932 ;; Printed -NIL ;; Returned + prints `1,002,932` @end lisp @end deffn @@ -215,14 +218,13 @@ Examples. @lisp (format t "~/cl-l10n:format-money/" 188232.2322) -R188,232.23 ;; Printed -NIL ;; Returned + prints `R188,232.23` ;; and (format t "~:/cl-l10n:format-money/" 188232.2322) -ZAR 188,232.23 ;; Printed -NIL ;; Returned + prints `ZAR 188,232.23` + @end lisp @end deffn @@ -238,8 +240,8 @@ The format of the time printed is controlled by @code{show-time} and @code{show-date}. If @emph{fmt} is not nil then @emph{show-date} and @emph{show-time} are ignored -and @emph{fmt} is used as the format control string. For details of control -characters try 'man date'. +and @emph{fmt} is used as the format control string. For details of format +directive look at 'man 1 date' although some directives are not supported, namely %U, %V and %W. Examples (assuming *locale* is ``en_ZA'') @lisp @@ -284,6 +286,114 @@ Root CL-L10N condition which will be signalled when an exceptional situation occurs. @end deftp + +@node I18N +@chapter I18N + +@section Internationalisation +CL-L10N supports internationalised strings through the use +of bundles. +The process is currently extremely basic, and is bound to +change in the future, but is flexible and does what is expected of it. + +First you define a bundle using @code{make-instance}. +@lisp +(defvar *my-bundle* (make-instance 'bundle)) +@end lisp + +Then you add resources to your bundle using either @code{add-resource} +or @code{add-resources}. + +@lisp +(add-resources (bundle "af_") + "showtime" "Dankie, die tyd is ~:@/cl-l10n:format-time/~%") + +;; an empty string as the locale matcher becomes the default +(add-resources (bundle "") + "showtime" "Thanks, the time is ~:@/cl-l10n:format-time/~%") + +@end lisp + +Then by using @code{gettext} you can lookup locale specific strings. +@lisp +(defun timey () (format t (gettext "showtime" bundle) 3310880446)) +(timey) ;; with locale en_ZA + prints `Thanks, the time is Wed 01 Dec 2004 11:00:46 +0200` + +(let ((*locale* (locale "af_ZA"))) + (timey)) + prints `Dankie, di tyd is Wo 01 Des 2004 11:00:46 +0200` +@end lisp + +A useful trick is to define either a macro or reader macro wrapping +gettext for your specific bundle +eg. +@lisp +(set-dispatch-macro-character + #\# #\" + #'(lambda (s c1 c2) + (declare (ignore c2)) + (unread-char c1 s) + `(cl-l10n:gettext ,(read s) bundle))) + +;; or this + +(defmacro _ (text) + `(cl-l10n:gettext ,text bundle)) + +@end lisp + +which would change the @code{timey} function to +@lisp +(defun timey () (format t #"showtime" 3310880446)) +;; or +(defun timey () (format t (_ "showtime") 3310880446)) + +@end lisp + +@section API +@anchor {Generic add-resource} +@deffn {Generic} add-resource bundle from to locale-name +Adds an entry to @emph{bundle} for @emph{locale-name} mappings +@emph{from} to @emph{to}. The @emph{locale-name} does not +have to be a full name like ``en_US'' but can be a partial match +like ``en_''. Adding mappings for these two locale-names will +result in the mapping for ``en_US'' being used when the locale +is ``en_US'' and the mapping for ``en_'' being used when using any +other english locale. Adding a mapping for an empty locale-name +will become the default. +@lisp +;; Add mapping for welcome for Afrikaans languages. +(add-resource *my-bundle* "welcome" "welkom" "af_") +@end lisp +@end deffn + +@anchor {Macro add-resources} +@deffn {Macro} add-resources (bundle locale-name) &rest entries +Utility macro to group large amounts of entries into a single +logical block for a locale. +@lisp +(add-resources (bundle "af_") + "hello" "hallo" + "goodbye" "totsiens" + "yes" "ja" + "no "nee") + +== + +(add-resource bundle "hello" "hallo" "af_") +(add-resource bundle "goodbye" "totsiens" "af_") +(add-resource bundle "yes" "ja" "af_") +(add-resource bundle "no" "nee" "af_") + +@end lisp +@end deffn + +@anchor {Function gettext} +@deffn {Function} gettext name bundle &optional (*locale* *locale* ) +Looks for a mapping for @emph{name} in @emph{bundle}. If no mapping +is found returns name. +@end deffn @node Notes

1 0

[cl-l10n-cvs] CVS update: cl-l10n/ChangeLog cl-l10n/cl-l10n.asd cl-l10n/load-locale.lisp cl-l10n/locale.lisp cl-l10n/package.lisp cl-l10n/printers.lisp cl-l10n/utils.lisp
by sross＠common-lisp.net 01 Dec '04

01 Dec '04

Update of /project/cl-l10n/cvsroot/cl-l10n In directory common-lisp.net:/tmp/cvs-serv28413 Modified Files: ChangeLog cl-l10n.asd load-locale.lisp locale.lisp package.lisp printers.lisp utils.lisp Log Message: Changelog 2004-12-01 Date: Wed Dec 1 12:48:40 2004 Author: sross Index: cl-l10n/ChangeLog diff -u cl-l10n/ChangeLog:1.2 cl-l10n/ChangeLog:1.3 --- cl-l10n/ChangeLog:1.2 Tue Nov 30 10:45:32 2004 +++ cl-l10n/ChangeLog Wed Dec 1 12:48:39 2004 @@ -1,3 +1,9 @@ +2004-12-01 Sean Ross <sross(a)common-lisp.net> + Version 0.1 Release + * i18n.lisp: Basic internationalisation support. + * tests.lisp: Basic tests for package. + * printers.lisp: Added format directive %s + 2004-11-30 Sean Ross <sross(a)common-lisp.net> * utils.lisp, printers.lisp: Changed read-from-string to parse-integer. @@ -9,7 +15,7 @@ LGPL. * README: Basic readme file. * load-locale.lisp: Fixed load-all-locales to really - load from a specific path and warnings if loading + load from a specific path and to signal a warning if loading a locale fails. * locale.lisp: Changed the typecase for locale-des->locale to etypecase. Index: cl-l10n/cl-l10n.asd diff -u cl-l10n/cl-l10n.asd:1.2 cl-l10n/cl-l10n.asd:1.3 --- cl-l10n/cl-l10n.asd:1.2 Tue Nov 30 10:45:32 2004 +++ cl-l10n/cl-l10n.asd Wed Dec 1 12:48:40 2004 @@ -11,7 +11,7 @@ :name "CL-L10N" :author "Sean Ross <sdr(a)jhb.ucs.co.za>" :maintainer "Sean Ross <sdr(a)jhb.ucs.co.za>" - :version "0.0.6" + :version "0.1" :description "Portable CL Locale Support" :long-description "Portable CL Package to support localization" :licence "MIT" @@ -19,10 +19,23 @@ (:file "utils" :depends-on ("package")) (:file "locale" :depends-on ("utils")) (:file "printers" :depends-on ("locale")) + (:file "i18n" :depends-on ("printers")) (:file "load-locale" :depends-on ("printers"))) :depends-on (:cl-ppcre)) (defmethod perform :after ((o load-op) (c (eql (find-system :cl-l10n)))) (provide 'cl-l10n)) - + + +(defmethod perform ((op test-op) (sys (eql (find-system :cl-l10n)))) + (oos 'load-op :cl-l10n-tests) + (oos 'test-op :cl-l10n-tests)) + +(defsystem cl-l10n-tests + :depends-on (rt cl-l10n) + :components ((:file "tests"))) + +(defmethod perform ((op test-op) (sys (eql (find-system :cl-l10n-tests)))) + (funcall (find-symbol "DO-TESTS" "REGRESSION-TEST"))) + ;; EOF Index: cl-l10n/load-locale.lisp diff -u cl-l10n/load-locale.lisp:1.5 cl-l10n/load-locale.lisp:1.6 --- cl-l10n/load-locale.lisp:1.5 Tue Nov 30 10:45:32 2004 +++ cl-l10n/load-locale.lisp Wed Dec 1 12:48:40 2004 @@ -18,7 +18,7 @@ (defun load-locale (name) (let ((path (merge-pathnames *locale-path* name))) - (format t ";; Loading locale from ~A.~%" path) + (format t "~&;; Loading locale from ~A.~%" path) (let ((locale (make-instance 'locale :name name)) (*read-eval* nil) (*print-circle* nil)) Index: cl-l10n/locale.lisp diff -u cl-l10n/locale.lisp:1.3 cl-l10n/locale.lisp:1.4 --- cl-l10n/locale.lisp:1.3 Tue Nov 30 10:45:32 2004 +++ cl-l10n/locale.lisp Wed Dec 1 12:48:40 2004 @@ -3,12 +3,7 @@ ;; TODO ;; What to do with LC_CTYPE, LC_COLLATE -;; Tests -;; Finish time format directives ;; Test on windows. -;; Merge with property files -;; Cache getters? (reset on reload of locales) -;; Time Zone printing ;; Parsers? (in-package :cl-l10n ) @@ -147,9 +142,6 @@ (defgetter "postal_fmt" "LC_ADDRESS") (defgetter "tel_int_fmt" "LC_TELEPHONE") (defgetter "measurement" "LC_MEASUREMENT") - - - ;; EOF Index: cl-l10n/package.lisp diff -u cl-l10n/package.lisp:1.1.1.1 cl-l10n/package.lisp:1.2 --- cl-l10n/package.lisp:1.1.1.1 Mon Nov 29 10:56:55 2004 +++ cl-l10n/package.lisp Wed Dec 1 12:48:40 2004 @@ -8,5 +8,6 @@ #:get-category #:get-cat-val #:locale-value #:load-all-locales #:*locale* #:*locale-path* #:*locales* #:format-number #:print-number #:format-money #:print-money - #:format-time #:print-time)) + #:format-time #:print-time #:add-resources #:bundle + #:add-resource #:gettext)) Index: cl-l10n/printers.lisp diff -u cl-l10n/printers.lisp:1.3 cl-l10n/printers.lisp:1.4 --- cl-l10n/printers.lisp:1.3 Tue Nov 30 10:45:32 2004 +++ cl-l10n/printers.lisp Wed Dec 1 12:48:40 2004 @@ -108,7 +108,7 @@ (princ point stream) (princ float-part stream)) (unless prec - (format stream "~A~A" sym-sep sym)) + (format stream "~A~A" sym-sep (trim sym))) (when (or* (= spos 0 2 4)) (when (= 2 sep-by-space) (print #\Space stream)) @@ -158,13 +158,12 @@ (def-formatter #\a (let ((day (1+ day))) (if (> day 6) (decf day 7)) - (format stream "~:(~A~)" (nth day (locale-abday locale))))) + (princ (nth day (locale-abday locale)) stream))) (def-formatter #\A (let ((day (1+ day))) (if (> day 6) (decf day 7)) - (format stream "~:(~A~)" - (nth day (locale-day locale))))) + (princ (nth day (locale-day locale)) stream))) (def-formatter #\b @@ -210,7 +209,6 @@ (princ (pad-val (if (> hour 12) (- hour 12) hour)) stream)) -;; %j day of year (defvar *mon-days* '(31 28 31 30 31 30 31 31 30 31 30 31)) @@ -272,6 +270,11 @@ (def-formatter #\R (print-time-string "%H:%M" stream ut locale)) +(defvar *1970-01-01* (encode-universal-time 0 0 0 01 01 1970 0)) + +(def-formatter #\s + (princ (- ut *1970-01-01*) stream)) + (def-formatter #\S (princ (pad-val sec) stream)) @@ -286,9 +289,11 @@ (when (> day 7) (decf day 7)) (princ day stream))) +;; FIXME (def-formatter #\U (locale-error "Unsupported time format directive ~S." #\U)) +;; FIXME (def-formatter #\V (locale-error "Unsupported time format directive ~S." #\V)) @@ -297,6 +302,7 @@ (if (< day 0) (incf day 7)) (princ day stream))) +;; FIXME (def-formatter #\W (locale-error "Unsupported time format directive ~S." #\W)) Index: cl-l10n/utils.lisp diff -u cl-l10n/utils.lisp:1.2 cl-l10n/utils.lisp:1.3 --- cl-l10n/utils.lisp:1.2 Tue Nov 30 10:45:32 2004 +++ cl-l10n/utils.lisp Wed Dec 1 12:48:40 2004 @@ -86,6 +86,29 @@ +(defun winner (test get seq) + (if (null seq) + nil + (let* ((val (elt seq 0)) + (res (funcall get val))) + (dolist (x (subseq seq 1) (values val res)) + (let ((call (funcall get x))) + (when (funcall test call res) + (setf res call + val x))))))) + +(defun compose (&rest fns) + (if fns + (let ((last-fn (last1 fns)) + (fns (butlast fns))) + #'(lambda (&rest args) + (reduce #'funcall + fns + :from-end t + :initial-value (apply last-fn args)))) + #'identity)) + + (defun get-first (fore aft) (if (< fore 1) "0"

1 0