Commit b22644d4 authored by rtoy's avatar rtoy
Browse files

Some changes to replace calls to gettext with _"" or _N"" for things

compiled with and without Unicode.  This is needed so that the pot
files have the same content for both unicode and non-unicode builds.
(The _"" and _N"" are handled by the reader, so things that are
conditionalized out still get processed, unlike using gettext.)
parent 57d43ce9
......@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fd-stream.lisp,v 1.121 2010/10/12 21:52:44 rtoy Exp $")
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fd-stream.lisp,v 1.122 2010/10/13 18:00:44 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
......@@ -1872,17 +1872,14 @@
(d (cond ((characterp decoding-error)
(constantly (char-code decoding-error)))
((eq t decoding-error)
#+unicode
#'(lambda (&rest args)
(apply 'cerror
(intl:gettext "Use Unicode replacement character instead")
args)
stream:+replacement-character-code+)
#-unicode
#'(lambda (&rest args)
(apply 'cerror
(intl:gettext "Use question mark character instead")
#+unicode _"Use Unicode replacement character instead"
#-unicode _"Use question mark character instead"
args)
#+unicode
stream:+replacement-character-code+
#-unicode
#\?))
(t
decoding-error))))
......
......@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/misc.lisp,v 1.41 2010/04/20 17:57:45 rtoy Rel $")
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/misc.lisp,v 1.42 2010/10/13 18:00:44 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
......@@ -182,7 +182,7 @@
(defun lisp-implementation-version ()
"Returns a string describing the implementation version."
(format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version
#+unicode (intl:gettext " Unicode") #-unicode ""))
#+unicode _" Unicode" #-unicode _""))
(defun machine-instance ()
"Returns a string giving the name of the local machine."
......
......@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/save.lisp,v 1.71 2010/09/26 20:40:51 rtoy Rel $")
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/save.lisp,v 1.72 2010/10/13 18:00:44 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
......@@ -364,14 +364,14 @@
#+unicode
(setf (getf *herald-items* :unicode)
`(,#'(lambda (stream)
(write-string (intl:gettext " Unicode ") stream))
(write-string _" Unicode " stream))
,(if (and (boundp 'lisp::*unidata-version*)
(>= (length lisp::*unidata-version*) 11))
(subseq lisp::*unidata-version* 11
(1- (length lisp::*unidata-version*)))
" ")
,#'(lambda (stream)
(write-string (intl:gettext "with Unicode version ") stream))
(write-string _"with Unicode version " stream))
,#'(lambda (stream)
(princ lisp::+unicode-major-version+ stream)
(write-char #\. stream)
......
......@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/string.lisp,v 1.27 2010/09/20 23:01:15 rtoy Rel $")
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/string.lisp,v 1.28 2010/10/13 18:00:44 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
......@@ -990,7 +990,7 @@
(when widep (incf index)))))))
(defun string-left-trim (char-bag string)
"Given a set of characters (a list or string) and a string, returns
_N"Given a set of characters (a list or string) and a string, returns
a copy of the string with the characters in the set removed from the
left end. If the set of characters is a string, surrogates will be
properly handled."
......@@ -1038,7 +1038,7 @@
(when widep (decf index)))))))
(defun string-right-trim (char-bag string)
"Given a set of characters (a list or string) and a string, returns
_N"Given a set of characters (a list or string) and a string, returns
a copy of the string with the characters in the set removed from the
right end. If the set of characters is a string, surrogates will be
properly handled."
......@@ -1048,7 +1048,7 @@
(subseq string start stop))))
(defun string-trim (char-bag string)
"Given a set of characters (a list or string) and a string, returns a
_N"Given a set of characters (a list or string) and a string, returns a
copy of the string with the characters in the set removed from both
ends. If the set of characters is a string, surrogates will be
properly handled."
......@@ -1352,17 +1352,17 @@
(shrink-vector target comp-pos)))))
(defun string-to-nfd (string)
"Convert String to Unicode Normalization Form D (NFD) using the
_N"Convert String to Unicode Normalization Form D (NFD) using the
canonical decomposition. The NFD string is returned"
(decompose string nil))
(defun string-to-nfkd (string)
"Convert String to Unicode Normalization Form KD (NFKD) uisng the
_N"Convert String to Unicode Normalization Form KD (NFKD) uisng the
compatible decomposition form. The NFKD string is returned."
(decompose string t))
(defun string-to-nfc (string)
"Convert String to Unicode Normalization Form C (NFC). If the
_N"Convert String to Unicode Normalization Form C (NFC). If the
string a simple string and is already normalized, the original
string is returned."
(if (normalized-form-p string :nfc)
......@@ -1373,7 +1373,7 @@
'simple-string)))
(defun string-to-nfkc (string)
"Convert String to Unicode Normalization Form KC (NFKC). If the
_N"Convert String to Unicode Normalization Form KC (NFKC). If the
string is a simple string and is already normalized, the original
string is returned."
(if (normalized-form-p string :nfkc)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment