Changeset 15164

Timestamp:

07/04/08 17:53:38 (3 months ago)

Author:

nowelium

Message:

 

Location:

lang/io/MessageResource

Files:

• io/MessageResource.io (modified) (3 diffs)
• tests/MessageResourceTest.io (modified) (2 diffs)

lang/io/MessageResource/io/MessageResource.io

@@ -9 +9 @@
         self encoding := split at(1)
         self encodeName := self encoding replaceMap(replace)
+        self encodingMessage := ("as" .. encoding) asMessage
     )
     getMessage := method(messageId, params,
@@ -15 +16 @@
     )
     curlyBrackets := method(
-        m := message("as" .. encoding)
         obj := Object clone
-        msgString := call message asString 
-        message := msgString doMessage(m) asMessage
-        message arguments foreach(arg,
+        call message arguments foreach(arg,
             arg setName("setSlot")
             obj doMessage(arg)
@@ -26 +24 @@
     )
     forward := method(
-        m := message("as" .. "self encoding")
         name := call message name
-        message := self getSlot(locale) getSlot(name) doMessage(m)
+        message := self getSlot(locale) getSlot(name)
         message container := self
+        message encodingMessage := self encodingMessage
         message curlyBrackets := method(
             obj := call delegateTo(container, call sender)
-            self interpolateInPlace(obj)
+            self asMutable doMessage(encodingMessage) interpolateInPlace(obj)
         )
         message

lang/io/MessageResource/tests/MessageResourceTest.io

@@ -9 +9 @@
     testGetMessage := method(
         serverStart := HogeMessage SERVER_START {name := "hoge"}
-        assertEquals(serverStart, "サーバ hoge が始動しました")
+        assertEquals(serverStart, "サーバ hoge が始動しました" asUTF8)
     )
 
@@ -17 +17 @@
             SERVER_STOP := "サーバ #{name} が停止しました"
         }
+        C := {
+            SERVER_START := "server #{name} has started",
+            SERVER_STOP :=  "server #{name} has stopped"
+        }
     )
 )