[uim] r7065 committed - * Merge r7064 from trunk.

[codesite-noreply]

Revision: 7065
Author:   ek.kato
Date:     Tue May 10 10:06:59 2011
Log:      * Merge r7064 from trunk.
http://code.google.com/p/uim/source/detail?r=7065

Modified:
 /branches/1.7/test/test-im.scm
 /branches/1.7/test/test-intl.scm

=======================================
--- /branches/1.7/test/test-im.scm      Thu Jan  6 18:09:56 2011
+++ /branches/1.7/test/test-im.scm      Tue May 10 10:06:59 2011
@@ -379,14 +379,14 @@
    (assert-equal 'byeoru
                 (uim '(im-name (find-im-for-locale "ko.UTF-8"))))
    ;; Vietnamese
-   (assert-equal 'm17n-vi-vni
-                (uim '(im-name (find-im-for-locale "vi"))))
-   (assert-equal 'm17n-vi-vni
-                (uim '(im-name (find-im-for-locale "vi_VN"))))
-   (assert-equal 'm17n-vi-vni
-                (uim '(im-name (find-im-for-locale "vi_VN.UTF-8"))))
-   (assert-equal 'm17n-vi-vni
-                (uim '(im-name (find-im-for-locale "vi.UTF-8"))))
+   ;;(assert-equal 'm17n-vi-vni
+   ;;           (uim '(im-name (find-im-for-locale "vi"))))
+   ;;(assert-equal 'm17n-vi-vni
+   ;;           (uim '(im-name (find-im-for-locale "vi_VN"))))
+   ;;(assert-equal 'm17n-vi-vni
+   ;;           (uim '(im-name (find-im-for-locale "vi_VN.UTF-8"))))
+   ;;(assert-equal 'm17n-vi-vni
+   ;;           (uim '(im-name (find-im-for-locale "vi.UTF-8"))))
    ;; native locale
    (uim '(unsetenv "LC_ALL"))
    (uim '(unsetenv "LANG"))
=======================================
--- /branches/1.7/test/test-intl.scm    Thu Jan  6 18:09:56 2011
+++ /branches/1.7/test/test-intl.scm    Tue May 10 10:06:59 2011
@@ -41,8 +41,8 @@
                                      :output :pipe
                                      :error :pipe
                                      :wait #t)))
-    (or (and (= 0 (process-exit-status locale-process))
-             (find #/\./ (port->string-list (process-output  
locale-process))))
+    (or ;(and (= 0 (process-exit-status locale-process))
+        ;     (find #/\./ (port->string-list (process-output  
locale-process))))
         (sys-getenv "LANG")
         (sys-getenv "LC_ALL"))))

@@ -67,6 +67,8 @@
          ;; generated on my environment. So, I guess available locales
          ;; from "locale -a" and use the current locale as fallback locale.
          ;;   -- kou 2009-03-22 -- Wow! just (- a-year 1) ago!
+         ;;
+         ;; at last, just use LANG -- ek 2011-05-11
          (lang (guess-current-locale))
          (LC_MESSAGES-dir (build-path locale-dir lang "LC_MESSAGES")))
     (make-directory* LC_MESSAGES-dir)