### Eclipse Workspace Patch 1.0 #P pathauto Index: pathauto.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.module,v retrieving revision 1.44.2.2 diff -u -r1.44.2.2 pathauto.module --- pathauto.module 8 Dec 2006 22:55:00 -0000 1.44.2.2 +++ pathauto.module 16 Jan 2007 16:40:17 -0000 @@ -225,52 +225,15 @@ "with" ); - static $translations = array( - 'À'=>'A','Ã?'=>'A','Â'=>'A','Ã'=>'A','Ä'=>'A','Ã…'=>'A','Ä€'=>'A','Ä„'=>'A','Ä‚'=>'A', - 'à'=>'a','á'=>'a','â'=>'a','ã'=>'a','ä'=>'a','Ã¥'=>'a','Ä?'=>'a','Ä…'=>'a','ă'=>'a', - 'Æ'=>'Ae', - 'æ'=>'ae', - 'Ç'=>'C','Ć'=>'C','ÄŒ'=>'C','Ĉ'=>'C','ÄŠ'=>'C', - 'ç'=>'c','ć'=>'c','Ä?'=>'c','ĉ'=>'c','Ä‹'=>'c', - 'ÄŽ'=>'D','Ä?'=>'D','Ã?'=>'D', - 'Ä?'=>'d','Ä‘'=>'d','ð'=>'d', - 'È'=>'E','É'=>'E','Ê'=>'E','Ë'=>'E','Ä’'=>'E','Ę'=>'E','Äš'=>'E','Ä”'=>'E','Ä–'=>'E', - 'è'=>'e','é'=>'e','ê'=>'e','ë'=>'e','Ä“'=>'e','Ä™'=>'e','Ä›'=>'e','Ä•'=>'e','Ä—'=>'e', - 'Æ’'=>'f', - 'Äœ'=>'G','Äž'=>'G','Ä '=>'G','Ä¢'=>'G', - 'Ä?'=>'g','ÄŸ'=>'g','Ä¡'=>'g','Ä£'=>'g', - 'Ĥ'=>'H','Ħ'=>'H', - 'Ä¥'=>'h','ħ'=>'h', - 'ÃŒ'=>'I','Ã?'=>'I','ÃŽ'=>'I','Ã?'=>'I','Ī'=>'I','Ĩ'=>'I','Ĭ'=>'I','Ä®'=>'I','İ'=>'I', - 'ì'=>'i','í'=>'i','î'=>'i','ï'=>'i','Ä«'=>'i','Ä©'=>'i','Ä­'=>'i','į'=>'i','ı'=>'i', - 'IJ'=>'Ij', - 'ij'=>'ij', - 'Ä´'=>'J', - 'ĵ'=>'j', - 'Ķ'=>'K', - 'Ä·'=>'k','ĸ'=>'k', - 'Å?'=>'L','Ľ'=>'L','Ĺ'=>'L','Ä»'=>'L','Ä¿'=>'L', - 'Å‚'=>'l','ľ'=>'l','ĺ'=>'l','ļ'=>'l','Å€'=>'l', - 'Ñ'=>'N','Ń'=>'N','Ň'=>'N','Å…'=>'N','ÅŠ'=>'N', - 'ñ'=>'n','Å„'=>'n','ň'=>'n','ņ'=>'n','ʼn'=>'n','Å‹'=>'n', - 'Ã’'=>'O','Ó'=>'O','Ô'=>'O','Õ'=>'O','Ö'=>'O','Ø'=>'O','ÅŒ'=>'O','Å?'=>'O','ÅŽ'=>'O', - 'ò'=>'o','ó'=>'o','ô'=>'o','õ'=>'o','ö'=>'o','ø'=>'o','Å?'=>'o','Å‘'=>'o','Å?'=>'o', - 'Å’'=>'Oe', - 'Å“'=>'oe', - 'Å”'=>'R','Ř'=>'R','Å–'=>'R', - 'Å•'=>'r','Å™'=>'r','Å—'=>'r', - 'Åš'=>'S','Å '=>'S','Åž'=>'S','Åœ'=>'S','Ș'=>'S', - 'Ť'=>'T','Å¢'=>'T','Ŧ'=>'T','Èš'=>'T','Þ'=>'T', - 'þ'=>'t', - 'Ù'=>'U','Ú'=>'U','Û'=>'U','Ü'=>'U','Ū'=>'U','Å®'=>'U','Ű'=>'U','Ŭ'=>'U','Ũ'=>'U','Ų'=>'U', - 'ú'=>'u','û'=>'u','ü'=>'u','Å«'=>'u','ů'=>'u','ű'=>'u','Å­'=>'u','Å©'=>'u','ų'=>'u', - 'Å´'=>'W', - 'ŵ'=>'w', - 'Ã?'=>'Y','Ŷ'=>'Y','Ÿ'=>'Y','Y'=>'Y', - 'ý'=>'y','ÿ'=>'y','Å·'=>'y', - 'Ź'=>'Z','Ž'=>'Z','Å»'=>'Z', - 'ž'=>'z','ż'=>'z','ź'=>'z', - 'ß'=>'ss','Å¿'=>'ss'); + static $i18n_loaded = false; + static $translations = array(); + if (!$i18n_loaded) { + $path = drupal_get_path('module', 'pathauto'); + if (is_file($path. '/i18n-ascii.txt')) { + $translations = parse_ini_file($path. '/i18n-ascii.txt'); + } + $i18n_loaded = true; + } // Replace or drop apostrophes based on user settings $separator = variable_get('pathauto_separator', '-'); @@ -289,7 +252,9 @@ $output = utf8_encode(strtr($output, array("\xC4"=>"Ae", "\xC6"=>"AE", "\xD6"=>"Oe", "\xDC"=>"Ue", "\xDE"=>"TH", "\xDF"=>"ss", "\xE4"=>"ae", "\xE6"=>"ae", "\xF6"=>"oe", "\xFC"=>"ue", "\xFE"=>"th")));*/ - $output = strtr($output, $translations); + if (count($translations) > 0) { + $output = strtr($output, $translations); + } // Get rid of words that are on the ignore list $ignore_re = "\b". preg_replace("/,/", "\b|\b", variable_get('pathauto_ignore_words', $ignore_words)) ."\b"; Index: INSTALL.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/Attic/INSTALL.txt,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 INSTALL.txt --- INSTALL.txt 12 Nov 2006 17:25:39 -0000 1.1.2.1 +++ INSTALL.txt 16 Jan 2007 16:40:16 -0000 @@ -14,5 +14,14 @@ When installing a new version of pathauto, to have any necessary database and variable upgrades applied. - +**Transliteration support: + +If you desire transliteration support in the creation of URLs (e.g. the +replacement of À with A) then you will need to rename the file +i18n-ascii.example.txt to i18n-ascii.txt + +You can then freely edit the i18n-ascii.txt without worrying that your changes +will be over-written by upgrades of Pathauto. + + $Id: INSTALL.txt,v 1.1.2.1 2006/11/12 17:25:39 greggles Exp $ \ No newline at end of file Index: i18n-ascii.example.txt =================================================================== RCS file: i18n-ascii.example.txt diff -N i18n-ascii.example.txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ i18n-ascii.example.txt 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,609 @@ +; global transliteration +[default] +À = "A" +Ã? = "A" + = "A" +à = "A" +Ä = "Ae" +Ã… = "A" +Æ = "A" +Ä€ = "A" +Ä„ = "A" +Ä‚ = "A" +Ç = "C" +Ć = "C" +ÄŒ = "C" +Ĉ = "C" +ÄŠ = "C" +ÄŽ = "D" +Ä? = "D" +È = "E" +É = "E" +Ê = "E" +Ë = "E" +Ä’ = "E" +Ę = "E" +Äš = "E" +Ä” = "E" +Ä– = "E" +Äœ = "G" +Äž = "G" +Ä  = "G" +Ä¢ = "G" +Ĥ = "H" +Ħ = "H" +ÃŒ = "I" +Ã? = "I" +ÃŽ = "I" +Ã? = "I" +Ī = "I" +Ĩ = "I" +Ĭ = "I" +Ä® = "I" +İ = "I" +IJ = "IJ" +Ä´ = "J" +Ķ = "K" +Ľ = "K" +Ĺ = "K" +Ä» = "K" +Ä¿ = "K" +Å? = "L" +Ñ = "N" +Ń = "N" +Ň = "N" +Å… = "N" +ÅŠ = "N" +Ã’ = "O" +Ó = "O" +Ô = "O" +Õ = "O" +Ö = "Oe" +Ø = "O" +ÅŒ = "O" +Å? = "O" +ÅŽ = "O" +Å’ = "OE" +Å” = "R" +Ř = "R" +Å– = "R" +Åš = "S" +Åž = "S" +Åœ = "S" +Ș = "S" +Å  = "S" +Ť = "T" +Å¢ = "T" +Ŧ = "T" +Èš = "T" +Ù = "U" +Ú = "U" +Û = "U" +Ü = "Ue" +Ū = "U" +Å® = "U" +Ű = "U" +Ŭ = "U" +Ũ = "U" +Ų = "U" +Å´ = "W" +Ŷ = "Y" +Ÿ = "Y" +Ã? = "Y" +Ź = "Z" +Å» = "Z" +Ž = "Z" +à = "a" +á = "a" +â = "a" +ã = "a" +ä = "ae" +Ä? = "a" +Ä… = "a" +ă = "a" +Ã¥ = "a" +æ = "ae" +ç = "c" +ć = "c" +Ä? = "c" +ĉ = "c" +Ä‹ = "c" +Ä? = "d" +Ä‘ = "d" +è = "e" +é = "e" +ê = "e" +ë = "e" +Ä“ = "e" +Ä™ = "e" +Ä› = "e" +Ä• = "e" +Ä— = "e" +Æ’ = "f" +Ä? = "g" +ÄŸ = "g" +Ä¡ = "g" +Ä£ = "g" +Ä¥ = "h" +ħ = "h" +ì = "i" +í = "i" +î = "i" +ï = "i" +Ä« = "i" +Ä© = "i" +Ä­ = "i" +į = "i" +ı = "i" +ij = "ij" +ĵ = "j" +Ä· = "k" +ĸ = "k" +Å‚ = "l" +ľ = "l" +ĺ = "l" +ļ = "l" +Å€ = "l" +ñ = "n" +Å„ = "n" +ň = "n" +ņ = "n" +ʼn = "n" +Å‹ = "n" +ò = "o" +ó = "o" +ô = "o" +õ = "o" +ö = "oe" +ø = "o" +Å? = "o" +Å‘ = "o" +Å? = "o" +Å“ = "oe" +Å• = "r" +Å™ = "r" +Å— = "r" +Å› = "s" +Å¡ = "s" +Å¥ = "t" +ù = "u" +ú = "u" +û = "u" +ü = "ue" +Å« = "u" +ů = "u" +ű = "u" +Å­ = "u" +Å© = "u" +ų = "u" +ŵ = "w" +ÿ = "y" +ý = "y" +Å· = "y" +ż = "z" +ź = "z" +ž = "z" +ß = "ss" +Å¿ = "ss" +Α = "A" +Ά = "A" +Ἀ = "A" +Ἁ = "A" +Ἂ = "A" +Ἃ = "A" +Ἄ = "A" +á¼? = "A" +Ἆ = "A" +á¼? = "A" +ᾈ = "A" +ᾉ = "A" +ᾊ = "A" +ᾋ = "A" +ᾌ = "A" +á¾? = "A" +ᾎ = "A" +á¾? = "A" +Ᾰ = "A" +á¾¹ = "A" +Ὰ = "A" +á¾» = "A" +á¾¼ = "A" +Î’ = "B" +Γ = "G" +Δ = "D" +Ε = "E" +Έ = "E" +Ἐ = "E" +á¼™ = "E" +Ἒ = "E" +á¼› = "E" +Ἔ = "E" +á¼? = "E" +Έ = "E" +Ὲ = "E" +Ζ = "Z" +Η = "I" +Ή = "I" +Ἠ = "I" +Ἡ = "I" +Ἢ = "I" +Ἣ = "I" +Ἤ = "I" +á¼­ = "I" +á¼® = "I" +Ἧ = "I" +ᾘ = "I" +á¾™ = "I" +ᾚ = "I" +á¾› = "I" +ᾜ = "I" +á¾? = "I" +ᾞ = "I" +ᾟ = "I" +Ὴ = "I" +á¿‹ = "I" +ῌ = "I" +Θ = "TH" +Ι = "I" +Ί = "I" +Ϊ = "I" +Ἰ = "I" +á¼¹ = "I" +Ἲ = "I" +á¼» = "I" +á¼¼ = "I" +á¼½ = "I" +á¼¾ = "I" +Ἷ = "I" +Ῐ = "I" +á¿™ = "I" +Ὶ = "I" +á¿› = "I" +Κ = "K" +Λ = "L" +Μ = "M" +Î? = "N" +Ξ = "KS" +Ο = "O" +ÎŒ = "O" +Ὀ = "O" +Ὁ = "O" +Ὂ = "O" +Ὃ = "O" +Ὄ = "O" +á½? = "O" +Ὸ = "O" +Ό = "O" +Π = "P" +Ρ = "R" +Ῥ = "R" +Σ = "S" +Τ = "T" +Î¥ = "Y" +ÎŽ = "Y" +Ϋ = "Y" +á½™ = "Y" +á½› = "Y" +á½? = "Y" +Ὗ = "Y" +Ῠ = "Y" +á¿© = "Y" +Ὺ = "Y" +á¿« = "Y" +Φ = "F" +Χ = "X" +Ψ = "PS" +Ω = "O" +Î? = "O" +Ὠ = "O" +Ὡ = "O" +Ὢ = "O" +Ὣ = "O" +Ὤ = "O" +á½­ = "O" +á½® = "O" +Ὧ = "O" +ᾨ = "O" +ᾩ = "O" +ᾪ = "O" +ᾫ = "O" +ᾬ = "O" +á¾­ = "O" +á¾® = "O" +ᾯ = "O" +Ὼ = "O" +á¿» = "O" +ῼ = "O" +α = "a" +ά = "a" +á¼€ = "a" +á¼? = "a" +ἂ = "a" +ἃ = "a" +ἄ = "a" +á¼… = "a" +ἆ = "a" +ἇ = "a" +á¾€ = "a" +á¾? = "a" +ᾂ = "a" +ᾃ = "a" +ᾄ = "a" +á¾… = "a" +ᾆ = "a" +ᾇ = "a" +á½° = "a" +á½± = "a" +á¾° = "a" +á¾± = "a" +á¾² = "a" +á¾³ = "a" +á¾´ = "a" +á¾¶ = "a" +á¾· = "a" +β = "b" +γ = "g" +δ = "d" +ε = "e" +έ = "e" +á¼? = "e" +ἑ = "e" +á¼’ = "e" +ἓ = "e" +á¼” = "e" +ἕ = "e" +á½² = "e" +á½³ = "e" +ζ = "z" +η = "i" +ή = "i" +á¼  = "i" +ἡ = "i" +á¼¢ = "i" +á¼£ = "i" +ἤ = "i" +á¼¥ = "i" +ἦ = "i" +á¼§ = "i" +á¾? = "i" +ᾑ = "i" +á¾’ = "i" +ᾓ = "i" +á¾” = "i" +ᾕ = "i" +á¾– = "i" +á¾— = "i" +á½´ = "i" +á½µ = "i" +á¿‚ = "i" +ῃ = "i" +á¿„ = "i" +ῆ = "i" +ῇ = "i" +θ = "th" +ι = "i" +ί = "i" +ÏŠ = "i" +Î? = "i" +á¼° = "i" +á¼± = "i" +á¼² = "i" +á¼³ = "i" +á¼´ = "i" +á¼µ = "i" +á¼¶ = "i" +á¼· = "i" +á½¶ = "i" +á½· = "i" +á¿? = "i" +á¿‘ = "i" +á¿’ = "i" +á¿“ = "i" +á¿– = "i" +á¿— = "i" +κ = "k" +λ = "l" +μ = "m" +ν = "n" +ξ = "ks" +ο = "o" +ÏŒ = "o" +á½€ = "o" +á½? = "o" +ὂ = "o" +ὃ = "o" +ὄ = "o" +á½… = "o" +ὸ = "o" +á½¹ = "o" +Ï€ = "p" +Ï? = "r" +ῤ = "r" +á¿¥ = "r" +σ = "s" +Ï‚ = "s" +Ï„ = "t" +Ï… = "y" +Ï? = "y" +Ï‹ = "y" +ΰ = "y" +á½? = "y" +ὑ = "y" +á½’ = "y" +ὓ = "y" +á½” = "y" +ὕ = "y" +á½– = "y" +á½— = "y" +ὺ = "y" +á½» = "y" +á¿  = "y" +á¿¡ = "y" +á¿¢ = "y" +á¿£ = "y" +ῦ = "y" +á¿§ = "y" +φ = "f" +χ = "x" +ψ = "ps" +ω = "o" +ÏŽ = "o" +á½  = "o" +ὡ = "o" +á½¢ = "o" +á½£ = "o" +ὤ = "o" +á½¥ = "o" +ὦ = "o" +á½§ = "o" +á¾  = "o" +ᾡ = "o" +á¾¢ = "o" +á¾£ = "o" +ᾤ = "o" +á¾¥ = "o" +ᾦ = "o" +á¾§ = "o" +á½¼ = "o" +á½½ = "o" +ῲ = "o" +ῳ = "o" +á¿´ = "o" +á¿¶ = "o" +á¿· = "o" +¨ = "" +Î… = "" +᾿ = "" +῾ = "" +á¿? = "" +á¿? = "" +῎ = "" +῞ = "" +á¿? = "" +῟ = "" +á¿€ = "" +á¿? = "" +΄ = "" +á¿® = "" +` = "" +á¿­ = "" +ͺ = "" +á¾½ = "" +Ð? = "A" +Б = "B" +Ð’ = "V" +Г = "G" +Д = "D" +Е = "E" +Ð? = "E" +Ж = "ZH" +З = "Z" +И = "I" +Й = "I" +К = "K" +Л = "L" +М = "M" +Ð? = "N" +О = "O" +П = "P" +Р = "R" +С = "S" +Т = "T" +У = "U" +Ф = "F" +Ð¥ = "KH" +Ц = "TS" +Ч = "CH" +Ш = "SH" +Щ = "SHCH" +Ы = "Y" +Э = "E" +Ю = "YU" +Я = "YA" +а = "A" +б = "B" +в = "V" +г = "G" +д = "D" +е = "E" +Ñ‘ = "E" +ж = "ZH" +з = "Z" +и = "I" +й = "I" +к = "K" +л = "L" +м = "M" +н = "N" +о = "O" +п = "P" +Ñ€ = "R" +Ñ? = "S" +Ñ‚ = "T" +у = "U" +Ñ„ = "F" +Ñ… = "KH" +ц = "TS" +ч = "CH" +ш = "SH" +щ = "SHCH" +Ñ‹ = "Y" +Ñ? = "E" +ÑŽ = "YU" +Ñ? = "YA" +Ъ = "" +ÑŠ = "" +Ь = "" +ÑŒ = "" + +ð = "d" +Ã? = "D" +þ = "th" +Þ = "TH" + +; Georgian +áƒ? = "a" +ბ = "b" +გ = "g" +დ = "d" +ე = "e" +ვ = "v" +ზ = "z" +თ = "t" +ი = "i" +კ = "k" +ლ = "l" +მ = "m" +ნ = "n" +áƒ? = "o" +პ = "p" +ჟ = "zh" +რ = "r" +ს = "s" +ტ = "t" +უ = "u" +ფ = "p" +ქ = "k" +ღ = "gh" +ყ = "q" +შ = "sh" +ჩ = "ch" +ც = "ts" +ძ = "dz" +წ = "ts" +ჭ = "ch" +ხ = "kh" +ჯ = "j" +ჰ = "h" + +; language-specific overrides +[fi-fi] +ä = "a" +ö = "o" +ü = "u" +Ä = "A" +Ö = "O" + +[is-is] +Æ = "AE" +