Changeset 1085

Timestamp:

09/02/10 16:53:40 (17 months ago)

Author:

james

Message:

updates to demon output plugin
fix some plurals

Location:

trunk

Files:

• modules/output.tcl (modified) (2 diffs)
• plugins/en/output_demon.tcl (modified) (2 diffs)

trunk/modules/output.tcl

@@ -115 +115 @@
         set channel [chandname2name $channel]
         regsub "^\"(.+)\"?$" $action {\1} action
-        if {([string index $action 0] != ".") && ([rand 10] == 0)} {
+        if {([string index $action 0] != ".") && (![regexp -nocase "^is" $action]) && ([rand 10] == 0)} {
                 set action "*$action*"
         } else {
@@ -1004 +1004 @@
         bMotion_putloglev 5 * "bMotionMakePlural ($text)"
 
-        if [regexp -nocase "(us|is|x|ch|sh)$" $text] {
+        if [regexp -nocase "(ss|ts|us|is|x|ch|sh)$" $text] {
                 append text "es"
                 return $text

trunk/plugins/en/output_demon.tcl

@@ -27 +27 @@
         foreach word $words {
 
+                regsub -all {([^aeiou])i([^aeiuo])} $word {\1y\2} word
                 regsub -all {c?k\M} $word {q} word
+
                 regsub -all {o([b-df-hj-np-tv-xz])e(s|ing)?\M} $word {oa\1\2} word
 
@@ -36 +38 @@
 
                 #other special cases to fix
-                set word [string map -nocase { soam some } $word]
+                set word [string map -nocase { soam some someoan someone } $word]
+
+                regsub -all {le(s)?\M} $word {al\1} word
 
                 # moving on...