WordPress.org

Make WordPress Core

Changeset 6765


Ignore:
Timestamp:
02/09/08 06:43:15 (6 years ago)
Author:
ryan
Message:

gettext for tinymce strings. Props azaozz. see #5769

Location:
trunk/wp-includes
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/js/tinymce/langs/en.js

    r6632 r6765  
    1 tinyMCE.addI18n({en:{ 
    2 common:{ 
    3 edit_confirm:"Do you want to use the WYSIWYG mode for this textarea?", 
    4 apply:"Apply", 
    5 insert:"Insert", 
    6 update:"Update", 
    7 cancel:"Cancel", 
    8 close:"Close", 
    9 browse:"Browse", 
    10 class_name:"Class", 
    11 not_set:"-- Not set --", 
    12 clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?", 
    13 clipboard_no_support:"Currently not supported by your browser, use keyboard shortcuts instead.", 
    14 popup_blocked:"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.", 
    15 invalid_data:"Error: Invalid values entered, these are marked in red.", 
    16 more_colors:"More colors" 
    17 }, 
    18 contextmenu:{ 
    19 align:"Alignment", 
    20 left:"Left", 
    21 center:"Center", 
    22 right:"Right", 
    23 full:"Full" 
    24 }, 
    25 insertdatetime:{ 
    26 date_fmt:"%Y-%m-%d", 
    27 time_fmt:"%H:%M:%S", 
    28 insertdate_desc:"Insert date", 
    29 inserttime_desc:"Insert time", 
    30 months_long:"January,February,March,April,May,June,July,August,September,October,November,December", 
    31 months_short:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec", 
    32 day_long:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday", 
    33 day_short:"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun" 
    34 }, 
    35 print:{ 
    36 print_desc:"Print" 
    37 }, 
    38 preview:{ 
    39 preview_desc:"Preview" 
    40 }, 
    41 directionality:{ 
    42 ltr_desc:"Direction left to right", 
    43 rtl_desc:"Direction right to left" 
    44 }, 
    45 layer:{ 
    46 insertlayer_desc:"Insert new layer", 
    47 forward_desc:"Move forward", 
    48 backward_desc:"Move backward", 
    49 absolute_desc:"Toggle absolute positioning", 
    50 content:"New layer..." 
    51 }, 
    52 save:{ 
    53 save_desc:"Save", 
    54 cancel_desc:"Cancel all changes" 
    55 }, 
    56 nonbreaking:{ 
    57 nonbreaking_desc:"Insert non-breaking space character" 
    58 }, 
    59 iespell:{ 
    60 iespell_desc:"Run spell checking", 
    61 download:"ieSpell not detected. Do you want to install it now?" 
    62 }, 
    63 advhr:{ 
    64 advhr_desc:"Horizontale rule" 
    65 }, 
    66 emotions:{ 
    67 emotions_desc:"Emotions" 
    68 }, 
    69 searchreplace:{ 
    70 search_desc:"Find", 
    71 replace_desc:"Find/Replace" 
    72 }, 
    73 advimage:{ 
    74 image_desc:"Insert/edit image" 
    75 }, 
    76 advlink:{ 
    77 link_desc:"Insert/edit link" 
    78 }, 
    79 xhtmlxtras:{ 
    80 cite_desc:"Citation", 
    81 abbr_desc:"Abbreviation", 
    82 acronym_desc:"Acronym", 
    83 del_desc:"Deletion", 
    84 ins_desc:"Insertion", 
    85 attribs_desc:"Insert/Edit Attributes" 
    86 }, 
    87 style:{ 
    88 desc:"Edit CSS Style" 
    89 }, 
    90 paste:{ 
    91 paste_text_desc:"Paste as Plain Text", 
    92 paste_word_desc:"Paste from Word", 
    93 selectall_desc:"Select All" 
    94 }, 
    95 paste_dlg:{ 
    96 text_title:"Use CTRL+V on your keyboard to paste the text into the window.", 
    97 text_linebreaks:"Keep linebreaks", 
    98 word_title:"Use CTRL+V on your keyboard to paste the text into the window." 
    99 }, 
    100 table:{ 
    101 desc:"Inserts a new table", 
    102 row_before_desc:"Insert row before", 
    103 row_after_desc:"Insert row after", 
    104 delete_row_desc:"Delete row", 
    105 col_before_desc:"Insert column before", 
    106 col_after_desc:"Insert column after", 
    107 delete_col_desc:"Remove column", 
    108 split_cells_desc:"Split merged table cells", 
    109 merge_cells_desc:"Merge table cells", 
    110 row_desc:"Table row properties", 
    111 cell_desc:"Table cell properties", 
    112 props_desc:"Table properties", 
    113 paste_row_before_desc:"Paste table row before", 
    114 paste_row_after_desc:"Paste table row after", 
    115 cut_row_desc:"Cut table row", 
    116 copy_row_desc:"Copy table row", 
    117 del:"Delete table", 
    118 row:"Row", 
    119 col:"Column", 
    120 cell:"Cell" 
    121 }, 
    122 autosave:{ 
    123 unload_msg:"The changes you made will be lost if you navigate away from this page." 
    124 }, 
    125 fullscreen:{ 
    126 desc:"Toggle fullscreen mode" 
    127 }, 
    128 media:{ 
    129 desc:"Insert / edit embedded media", 
    130 edit:"Edit embedded media" 
    131 }, 
    132 fullpage:{ 
    133 desc:"Document properties" 
    134 }, 
    135 template:{ 
    136 desc:"Insert predefined template content" 
    137 }, 
    138 visualchars:{ 
    139 desc:"Visual control characters on/off." 
    140 }, 
    141 spellchecker:{ 
    142 desc:"Toggle spellchecker", 
    143 menu:"Spellchecker settings", 
    144 ignore_word:"Ignore word", 
    145 ignore_words:"Ignore all", 
    146 langs:"Languages", 
    147 wait:"Please wait...", 
    148 sug:"Suggestions", 
    149 no_sug:"No suggestions", 
    150 no_mpell:"No misspellings found." 
    151 }, 
    152 pagebreak:{ 
    153 desc:"Insert page break." 
    154 }}}); 
  • trunk/wp-includes/js/tinymce/plugins/media/langs/en_dlg.js

    r6632 r6765  
    1 tinyMCE.addI18n('en.media_dlg',{ 
    2 title:"Insert / edit embedded media", 
    3 general:"General", 
    4 advanced:"Advanced", 
    5 file:"File/URL", 
    6 list:"List", 
    7 size:"Dimensions", 
    8 preview:"Preview", 
    9 constrain_proportions:"Constrain proportions", 
    10 type:"Type", 
    11 id:"Id", 
    12 name:"Name", 
    13 class_name:"Class", 
    14 vspace:"V-Space", 
    15 hspace:"H-Space", 
    16 play:"Auto play", 
    17 loop:"Loop", 
    18 menu:"Show menu", 
    19 quality:"Quality", 
    20 scale:"Scale", 
    21 align:"Align", 
    22 salign:"SAlign", 
    23 wmode:"WMode", 
    24 bgcolor:"Background", 
    25 base:"Base", 
    26 flashvars:"Flashvars", 
    27 liveconnect:"SWLiveConnect", 
    28 autohref:"AutoHREF", 
    29 cache:"Cache", 
    30 hidden:"Hidden", 
    31 controller:"Controller", 
    32 kioskmode:"Kiosk mode", 
    33 playeveryframe:"Play every frame", 
    34 targetcache:"Target cache", 
    35 correction:"No correction", 
    36 enablejavascript:"Enable JavaScript", 
    37 starttime:"Start time", 
    38 endtime:"End time", 
    39 href:"Href", 
    40 qtsrcchokespeed:"Choke speed", 
    41 target:"Target", 
    42 volume:"Volume", 
    43 autostart:"Auto start", 
    44 enabled:"Enabled", 
    45 fullscreen:"Fullscreen", 
    46 invokeurls:"Invoke URLs", 
    47 mute:"Mute", 
    48 stretchtofit:"Stretch to fit", 
    49 windowlessvideo:"Windowless video", 
    50 balance:"Balance", 
    51 baseurl:"Base URL", 
    52 captioningid:"Captioning id", 
    53 currentmarker:"Current marker", 
    54 currentposition:"Current position", 
    55 defaultframe:"Default frame", 
    56 playcount:"Play count", 
    57 rate:"Rate", 
    58 uimode:"UI Mode", 
    59 flash_options:"Flash options", 
    60 qt_options:"Quicktime options", 
    61 wmp_options:"Windows media player options", 
    62 rmp_options:"Real media player options", 
    63 shockwave_options:"Shockwave options", 
    64 autogotourl:"Auto goto URL", 
    65 center:"Center", 
    66 imagestatus:"Image status", 
    67 maintainaspect:"Maintain aspect", 
    68 nojava:"No java", 
    69 prefetch:"Prefetch", 
    70 shuffle:"Shuffle", 
    71 console:"Console", 
    72 numloop:"Num loops", 
    73 controls:"Controls", 
    74 scriptcallbacks:"Script callbacks", 
    75 swstretchstyle:"Stretch style", 
    76 swstretchhalign:"Stretch H-Align", 
    77 swstretchvalign:"Stretch V-Align", 
    78 sound:"Sound", 
    79 progress:"Progress", 
    80 qtsrc:"QT Src", 
    81 qt_stream_warn:"Streamed rtsp resources should be added to the QT Src field under the advanced tab.\nYou should also add a non streamed version to the Src field..", 
    82 align_top:"Top", 
    83 align_right:"Right", 
    84 align_bottom:"Bottom", 
    85 align_left:"Left", 
    86 align_center:"Center", 
    87 align_top_left:"Top left", 
    88 align_top_right:"Top right", 
    89 align_bottom_left:"Bottom left", 
    90 align_bottom_right:"Bottom right", 
    91 flv_options:"Flash video options", 
    92 flv_scalemode:"Scale mode", 
    93 flv_buffer:"Buffer", 
    94 flv_startimage:"Start image", 
    95 flv_starttime:"Start time", 
    96 flv_defaultvolume:"Default volumne", 
    97 flv_hiddengui:"Hidden GUI", 
    98 flv_autostart:"Auto start", 
    99 flv_loop:"Loop", 
    100 flv_showscalemodes:"Show scale modes", 
    101 flv_smoothvideo:"Smooth video", 
    102 flv_jscallback:"JS Callback" 
    103 }); 
  • trunk/wp-includes/js/tinymce/plugins/paste/langs/en_dlg.js

    r6632 r6765  
    1 tinyMCE.addI18n('en.paste_dlg',{ 
    2 text_title:"Use CTRL+V on your keyboard to paste the text into the window.", 
    3 text_linebreaks:"Keep linebreaks", 
    4 word_title:"Use CTRL+V on your keyboard to paste the text into the window." 
    5 }); 
  • trunk/wp-includes/js/tinymce/plugins/wordpress/langs/en.js

    r6694 r6765  
    1 tinyMCE.addI18n('en.wordpress',{ 
    2 wp_adv_desc : 'Show/Hide Advanced Toolbar', 
    3 wp_more_desc : 'Split post with More tag', 
    4 wp_page_desc : 'Split post with Page tag', 
    5 wp_help_desc : 'Help', 
    6 wp_more_alt : 'More...', 
    7 wp_page_alt : 'Next page...' 
    8 }); 
  • trunk/wp-includes/js/tinymce/themes/advanced/langs/en.js

    r6632 r6765  
    1 tinyMCE.addI18n('en.advanced',{ 
    2 style_select:"Styles", 
    3 font_size:"Font size", 
    4 fontdefault:"Font family", 
    5 block:"Format", 
    6 paragraph:"Paragraph", 
    7 div:"Div", 
    8 address:"Address", 
    9 pre:"Preformatted", 
    10 h1:"Heading 1", 
    11 h2:"Heading 2", 
    12 h3:"Heading 3", 
    13 h4:"Heading 4", 
    14 h5:"Heading 5", 
    15 h6:"Heading 6", 
    16 blockquote:"Blockquote", 
    17 code:"Code", 
    18 samp:"Code sample", 
    19 dt:"Definition term ", 
    20 dd:"Definition description", 
    21 bold_desc:"Bold (Ctrl+B)", 
    22 italic_desc:"Italic (Ctrl+I)", 
    23 underline_desc:"Underline (Ctrl+U)", 
    24 striketrough_desc:"Strikethrough", 
    25 justifyleft_desc:"Align left", 
    26 justifycenter_desc:"Align center", 
    27 justifyright_desc:"Align right", 
    28 justifyfull_desc:"Align full", 
    29 bullist_desc:"Unordered list", 
    30 numlist_desc:"Ordered list", 
    31 outdent_desc:"Outdent", 
    32 indent_desc:"Indent", 
    33 undo_desc:"Undo (Ctrl+Z)", 
    34 redo_desc:"Redo (Ctrl+Y)", 
    35 link_desc:"Insert/edit link", 
    36 unlink_desc:"Unlink", 
    37 image_desc:"Insert/edit image", 
    38 cleanup_desc:"Cleanup messy code", 
    39 code_desc:"Edit HTML Source", 
    40 sub_desc:"Subscript", 
    41 sup_desc:"Superscript", 
    42 hr_desc:"Insert horizontal ruler", 
    43 removeformat_desc:"Remove formatting", 
    44 custom1_desc:"Your custom description here", 
    45 forecolor_desc:"Select text color", 
    46 backcolor_desc:"Select background color", 
    47 charmap_desc:"Insert custom character", 
    48 visualaid_desc:"Toggle guidelines/invisible elements", 
    49 anchor_desc:"Insert/edit anchor", 
    50 cut_desc:"Cut", 
    51 copy_desc:"Copy", 
    52 paste_desc:"Paste", 
    53 image_props_desc:"Image properties", 
    54 newdocument_desc:"New document", 
    55 help_desc:"Help", 
    56 blockquote_desc:"Blockquote", 
    57 clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\r\nDo you want more information about this issue?", 
    58 path:"Path", 
    59 newdocument:"Are you sure you want clear all contents?", 
    60 toolbar_focus:"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X", 
    61 more_colors:"More colors" 
    62 }); 
  • trunk/wp-includes/js/tinymce/themes/advanced/langs/en_dlg.js

    r6632 r6765  
    1 tinyMCE.addI18n('en.advanced_dlg',{ 
    2 about_title:"About TinyMCE", 
    3 about_general:"About", 
    4 about_help:"Help", 
    5 about_license:"License", 
    6 about_plugins:"Plugins", 
    7 about_plugin:"Plugin", 
    8 about_author:"Author", 
    9 about_version:"Version", 
    10 about_loaded:"Loaded plugins", 
    11 anchor_title:"Insert/edit anchor", 
    12 anchor_name:"Anchor name", 
    13 code_title:"HTML Source Editor", 
    14 code_wordwrap:"Word wrap", 
    15 colorpicker_title:"Select a color", 
    16 colorpicker_picker_tab:"Picker", 
    17 colorpicker_picker_title:"Color picker", 
    18 colorpicker_palette_tab:"Palette", 
    19 colorpicker_palette_title:"Palette colors", 
    20 colorpicker_named_tab:"Named", 
    21 colorpicker_named_title:"Named colors", 
    22 colorpicker_color:"Color:", 
    23 colorpicker_name:"Name:", 
    24 charmap_title:"Select custom character", 
    25 image_title:"Insert/edit image", 
    26 image_src:"Image URL", 
    27 image_alt:"Image description", 
    28 image_list:"Image list", 
    29 image_border:"Border", 
    30 image_dimensions:"Dimensions", 
    31 image_vspace:"Vertical space", 
    32 image_hspace:"Horizontal space", 
    33 image_align:"Alignment", 
    34 image_align_baseline:"Baseline", 
    35 image_align_top:"Top", 
    36 image_align_middle:"Middle", 
    37 image_align_bottom:"Bottom", 
    38 image_align_texttop:"Text top", 
    39 image_align_textbottom:"Text bottom", 
    40 image_align_left:"Left", 
    41 image_align_right:"Right", 
    42 link_title:"Insert/edit link", 
    43 link_url:"Link URL", 
    44 link_target:"Target", 
    45 link_target_same:"Open link in the same window", 
    46 link_target_blank:"Open link in a new window", 
    47 link_titlefield:"Title", 
    48 link_is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?", 
    49 link_is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?", 
    50 link_list:"Link list" 
    51 }); 
  • trunk/wp-includes/js/tinymce/tiny_mce_config.php

    r6726 r6765  
    33    cache_javascript_headers(); 
    44 
    5     function wp_translate_tinymce_lang($text) { 
     5    // deprecated 
     6    function wp_translate_tinymce_lang($text) { 
    67        if ( ! function_exists('__') ) { 
    78            return $text; 
     
    5354        $mce_css = str_replace('http://', 'https://', $mce_css); 
    5455 
    55     $mce_locale = ( '' == get_locale() ) ? 'en' : strtolower(get_locale()); 
     56    $mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) ); // only ISO 639-1 
    5657?> 
    5758 
     
    7778    relative_urls : false, 
    7879    remove_script_host : false, 
    79     force_p_newlines : true, 
    80     force_br_newlines : false, 
    81     convert_newlines_to_brs : false, 
    82     remove_linebreaks : false, 
    8380    fix_list_elements : true, 
    8481    fix_table_elements : true, 
     
    9087    <?php if ( $valid_elements ) echo 'valid_elements : "' . $valid_elements . '",' . "\n"; ?> 
    9188    <?php if ( $invalid_elements ) echo 'invalid_elements : "' . $invalid_elements . '",' . "\n"; ?> 
    92     save_callback : "switchEditors.saveCallback", 
     89    save_callback : "switchEditors.saveCallback", 
    9390<?php do_action('mce_options'); ?> 
    9491    plugins : "<?php echo $plugins; ?>" 
  • trunk/wp-includes/js/tinymce/tiny_mce_gzip.php

    r6726 r6765  
    11<?php 
    2 /** 
     2/** Based on: 
    33 * $Id: tiny_mce_gzip.php 315 2007-10-25 14:03:43Z spocke $ 
    44 * 
     
    1111 */ 
    1212 
    13 //error_reporting(E_ALL); 
    14     @require_once('../../../wp-config.php');  // For get_bloginfo(). 
    15  
    16     // Headers 
    17     $expiresOffset = 3600 * 24 * 10; // Cache for 10 days in browser cache 
    18     header("Content-type: text/javascript"); 
    19     header("Vary: Accept-Encoding");  // Handle proxies 
    20     header("Expires: " . gmdate("D, d M Y H:i:s", time() + $expiresOffset) . " GMT"); 
     13@require_once('../../../wp-config.php');  // For get_bloginfo(). 
     14cache_javascript_headers(); 
    2115 
    2216if ( isset($_GET['load']) ) { 
    2317 
    24     function getParam( $name, $def = false ) { 
     18    function getParam( $name, $def = false ) { 
    2519        if ( ! isset($_GET[$name]) ) 
    2620            return $def; 
     
    3226        $path = realpath($path); 
    3327 
    34         if ( !$path || !@is_file($path) ) 
     28        if ( ! $path || !@is_file($path) ) 
    3529            return ''; 
    3630 
     
    5347    function putFileContents( $path, $content ) { 
    5448        if ( function_exists('file_put_contents') ) 
    55             return @file_put_contents($path, $content); 
     49            return @file_put_contents( $path, $content ); 
    5650 
    5751        $fp = @fopen($path, 'wb'); 
     
    6256    } 
    6357 
    64  
    65     // Get input 
     58    // WP defaults 
     59    $themes = explode( ',', getParam('themes', 'advanced') ); 
     60 
     61    $language = getParam( 'languages', 'en' ); 
     62    $language = strtolower( substr($language, 0, 2) ); // only ISO 639-1 
     63 
    6664    $plugins = explode( ',', getParam('plugins', '') ); 
    67     $languages = explode( ',', getParam('languages', '') ); 
    68     $themes = explode( ',', getParam('themes', '') ); 
    69     $diskCache = getParam( 'diskcache', '' ) == 'true'; 
    70     $isJS = getParam( 'js', '' ) == 'true'; 
    71     $compress = getParam( 'compress', 'true' ) == 'true'; 
    72     $core = getParam( 'core', 'true' ) == 'true'; 
    73     $suffix = getParam( 'suffix', '_src' ) == '_src' ? '_src' : ''; 
    7465    $cachePath = realpath('.'); // Cache path, this is where the .gz files will be stored 
    7566 
    76     $content = ''; 
    7767    $encodings = array(); 
    78     $supportsGzip = false; 
    79     $enc = ''; 
    80     $cacheKey = ''; 
    81  
    82     // WP. Language handling could be improved... Concat all translated langs files and store in /wp-content/languages as .mo? 
    83     $theme = getParam( 'theme', 'advanced' ); 
    84     $themes = array($theme); 
    85  
    86     $language = getParam( 'language', 'en' ); 
    87     $languages = array($language); 
    88  
    89     if ( $language != strtolower($language) ) 
    90         $languages[] = strtolower($language); 
    91  
    92     if ( $language != substr($language, 0, 2) ) 
    93         $languages[] = substr($language, 0, 2); 
    94  
    95     $diskCache = false; 
    96     $isJS = true; 
    97     $suffix = ''; 
     68    $supportsGzip = $diskCache = false; 
     69    $compress = $core = true; 
     70    $suffix = $content = $enc = $cacheKey = ''; 
    9871 
    9972    // Custom extra javascripts to pack 
     
    10477    */); 
    10578 
    106     // Is called directly then auto init with default settings 
    107     if ( ! $isJS ) { 
    108         echo getFileContents('tiny_mce_gzip.js'); 
    109         echo 'tinyMCE_GZ.init({});'; 
    110         die(); 
    111     } 
    112  
    113     // Setup cache info 
     79    // Setup cache info 
    11480    if ( $diskCache ) { 
    11581        if ( ! $cachePath ) 
     
    13096 
    13197    // Check if it supports gzip 
    132     if ( isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) 
    133         $encodings = explode( ',', strtolower( preg_replace('/\s+/', '', $_SERVER['HTTP_ACCEPT_ENCODING']) ) ); 
    134  
    135     if ( ( in_array('gzip', $encodings) || in_array('x-gzip', $encodings) || isset($_SERVER['---------------']) ) && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression') ) { 
     98    if ( isset( $_SERVER['HTTP_ACCEPT_ENCODING'] ) ) 
     99        $encodings = explode(',', strtolower(preg_replace( '/\s+/', '', $_SERVER['HTTP_ACCEPT_ENCODING']) ) ); 
     100 
     101    if ( ( in_array('gzip', $encodings ) || in_array( 'x-gzip', $encodings ) || isset($_SERVER['---------------']) ) && function_exists( 'ob_gzhandler' ) && ! ini_get('zlib.output_compression') ) { 
    136102        $enc = in_array( 'x-gzip', $encodings ) ? 'x-gzip' : 'gzip'; 
    137103        $supportsGzip = true; 
     
    143109            header('Content-Encoding: ' . $enc); 
    144110 
    145         echo getFileContents($cacheFile); 
     111        echo getFileContents( $cacheFile ); 
    146112        die(); 
    147113    } 
     
    149115    // Add core 
    150116    if ( $core == 'true' ) { 
    151         $content .= getFileContents('tiny_mce' . $suffix . '.js'); 
     117        $content .= getFileContents( 'tiny_mce' . $suffix . '.js' ); 
    152118 
    153119        // Patch loading functions 
     
    155121    } 
    156122 
    157     // Add core languages 
    158     $lang_content = ''; 
    159     foreach ( $languages as $lang ) 
    160         $lang_content .= getFileContents('langs/' . $lang . '.js'); 
    161  
    162     if ( empty($lang_content) && file_exists('langs/en.js') ) 
    163         $lang_content .= getFileContents('langs/en.js'); 
    164  
    165     $content .= $lang_content; 
     123    // Add all languages (WP) 
     124    include_once( dirname(__file__).'/langs/wp-langs.php' ); 
     125    $content .= $strings; 
    166126 
    167127    // Add themes 
    168     foreach ( $themes as $theme ) { 
    169         $content .= getFileContents( 'themes/' . $theme . '/editor_template' . $suffix . '.js'); 
    170  
    171         $lang_content = ''; 
    172         foreach ( $languages as $lang ) 
    173             $lang_content .= getFileContents( 'themes/' . $theme . '/langs/' . $lang . '.js' ); 
    174  
    175         if ( empty($lang_content) && file_exists( 'themes/' . $theme . '/langs/en.js' ) ) 
    176             $lang_content .= getFileContents( 'themes/' . $theme . '/langs/en.js' ); 
    177  
    178         $content .= $lang_content; 
    179     } 
    180  
     128    foreach ( $themes as $theme )  
     129        $content .= getFileContents( 'themes/' . $theme . '/editor_template' . $suffix . '.js' ); 
     130     
    181131    // Add plugins 
    182     foreach ( $plugins as $plugin ) { 
    183         $content .= getFileContents('plugins/' . $plugin . '/editor_plugin' . $suffix . '.js'); 
    184  
    185         $lang_content = ''; 
    186         foreach ( $languages as $lang ) 
    187             $lang_content .= getFileContents( 'plugins/' . $plugin . '/langs/' . $lang . '.js' ); 
    188  
    189         if ( empty($lang_content) && file_exists( 'plugins/' . $plugin . '/langs/en.js' ) ) 
    190             $lang_content .= getFileContents( 'plugins/' . $plugin . '/langs/en.js' ); 
    191  
    192         $content .= $lang_content; 
    193     } 
     132    foreach ( $plugins as $plugin )  
     133        $content .= getFileContents( 'plugins/' . $plugin . '/editor_plugin' . $suffix . '.js' ); 
    194134 
    195135    // Add custom files 
     
    210150 
    211151        // Write gz file 
    212         if ( $diskCache && $cacheKey != '' ) 
     152        if ( $diskCache && '' != $cacheKey ) 
    213153            putFileContents( $cacheFile, $cacheData ); 
    214154 
     
    237177    }, 
    238178 
    239     opt : {}, 
    240  
    241     init : function(arr, cb) { 
    242         var t = this, n, s, nl = document.getElementsByTagName('script'); 
    243  
    244         t.opt = arr; 
    245  
    246         t.settings.themes = arr.theme; 
    247         t.settings.plugins = arr.plugins; 
    248         t.settings.languages = arr.language; 
    249         s = t.settings; 
    250         t.cb = cb || ''; 
     179    opt : {}, 
     180 
     181    init : function(o, cb) { 
     182        var t = this, n, s = t.settings, nl = document.getElementsByTagName('script'); 
     183 
     184        t.opt = o; 
     185 
     186        s.themes = o.theme; 
     187        s.plugins = o.plugins;  
     188        s.languages = o.language; 
     189        t.settings = s; 
     190 
     191        t.cb = cb || ''; 
    251192 
    252193        for (i=0; i<nl.length; i++) { 
     
    256197                t.baseURL = n.src.substring(0, n.src.lastIndexOf('/')); 
    257198        } 
    258         tinyMCEPreInit.base = t.baseURL; 
    259  
     199        tinyMCEPreInit.base = t.baseURL; 
     200         
    260201        if (!t.coreLoaded) 
    261202            t.loadScripts(1, s.themes, s.plugins, s.languages); 
     
    282223            t.coreLoaded = 1; 
    283224 
    284     // Easier to debug with this... 
    285225    //  document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + t.baseURL + '/' + s.page_name + '?' + q + '"></script>'); 
    286226 
  • trunk/wp-includes/js/tinymce/tiny_mce_popup.js

    r6694 r6765  
    8484        var u = this.getWindowArg('plugin_url') || this.getWindowArg('theme_url'); 
    8585 
    86         if (u) 
     86        if (u && u.indexOf('wp-includes') == -1 ) 
    8787            document.write('<script type="text/javascript" src="' + u + '/langs/' + this.editor.settings.language + '_dlg.js' + '"></script>'); 
    8888    }, 
  • trunk/wp-includes/script-loader.php

    r6761 r6765  
    3131 
    3232        // Modify this version when tinyMCE plugins are changed 
    33         $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '20080129' ); 
     33        $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '20080208' ); 
    3434 
    3535        $mce_config = apply_filters('tiny_mce_config_url', '/wp-includes/js/tinymce/tiny_mce_config.php'); 
Note: See TracChangeset for help on using the changeset viewer.