mirror of
https://github.com/cookiengineer/audacity
synced 2025-10-11 17:13:37 +02:00
Don't use \n sequence inside Lisp strings needing translation...
... Because xgettext will just remove the \, not replace \n with newline. That's consistent with Lisp reader behavior in this documentation: http://www.lispworks.com/documentation/lw70/CLHS/Body/02_de.htm The XLisp reader, which replaces \n with newline, is nonstandard. So, to accommodate xgettext, use (format nil "...~%...") instead, or where you can't do that in a $ header line, just make a line break inside the "" There are a few "\n" left alone in sample-data-export.ny which are neither in $ lines nor inside (_ "...")
This commit is contained in:
@@ -107,21 +107,23 @@ $control bad-data (_"Invalid data handling") choice ((_"Throw error") (_"Read as
|
||||
(defun fileopensp (path fname)
|
||||
(let ((path (string-trim " " path)))
|
||||
(if (string-equal fname "")
|
||||
(throw 'err (_"Error\nNo file name.")))
|
||||
(throw 'err (format nil (_"Error~%No file name."))))
|
||||
(if (string-not-equal fname ".txt" :start1 (- (length fname) 4))
|
||||
(throw 'err (_"Error\nThe file must be a plain ASCII text file\nwith '.txt' file extension.")))
|
||||
(throw 'err (format nil (_"Error~%The file must be a plain ASCII text file~%with '.txt' file extension."))))
|
||||
;; Handle special 'path' formats:
|
||||
(cond
|
||||
; "~" without "/" is not recommended (or documented)
|
||||
; but more user friendly to allow it.
|
||||
((string= path "~")
|
||||
(if (windowsp)
|
||||
(_"Error\n'~/' is not valid on Windows")
|
||||
;i18n-hint: ~~ format directive must be preserved; displays as one ~
|
||||
(format nil (_"Error~%'~~/' is not valid on Windows"))
|
||||
(setq path (home))))
|
||||
;; replace "~/" on Linux/Mac
|
||||
((and (>= (length path) 2) (string= path "~/" :end1 2))
|
||||
(if (windowsp)
|
||||
(_"Error\n'~/' is not valid on Windows")
|
||||
;i18n-hint: ~~ format directive must be preserved; displays as one ~
|
||||
(format nil (_"Error~%'~~/' is not valid on Windows"))
|
||||
(setq path (strcat (home)(subseq path 1)))))
|
||||
((string-equal path (_"Home directory"))
|
||||
(setf path (home)))
|
||||
@@ -195,7 +197,7 @@ $control bad-data (_"Invalid data handling") choice ((_"Throw error") (_"Read as
|
||||
(defun sound-from-file (filename)
|
||||
;; Set path. fileopenp should return 'true'
|
||||
(if (not (fileopensp path filename))
|
||||
(throw 'err (_"Error.\nUnable to open file")))
|
||||
(throw 'err (format nil (_"Error.~%Unable to open file"))))
|
||||
; Note: we can't use (arrayp *track*) because
|
||||
; *track* is nil in generate type plug-ins.
|
||||
(cond
|
||||
|
Reference in New Issue
Block a user