Changeset 2929

Show
Ignore:
Timestamp:
08/15/08 05:19:57 (4 months ago)
Author:
fumiakiy
Message:

Merging feature-no-make-me branch to trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk

    • Property svn:ignore changed from
      mt-config.cgi
      mt-check.cgi
      mt-config.cgi-original
      build-language-stamp
      index.html
      readme.html
       to
      mt-config.cgi
      mt-config.cgi-original
      build-language-stamp

  • trunk/Makefile

    r2704 r2929  
    6161.PHONY: code-common code code-en_US code-de code-fr code-nl \ 
    6262        code-es code-ja 
    63 code_common = lib/MT.pm php/mt.php mt-check.cgi \ 
     63code_common = lib/MT.pm php/mt.php \ 
    6464        mt-static/js/mt_core_compact.js \ 
    6565        mt-static/css/main.css \ 
    66         mt-static/css/simple.css \ 
    67         mt-config.cgi-original index.html readme.html 
     66        mt-static/css/simple.css 
    6867 
    6968code: check code-$(BUILD_LANGUAGE) 
    …… 
    8786        fi 
    8887 
    89 lib/MT.pm: %: %.pre build-language-stamp build/mt-dists/$(BUILD_PACKAGE).mk build/mt-dists/default.mk 
     88lib/MT.pm: build-language-stamp build/mt-dists/$(BUILD_PACKAGE).mk build/mt-dists/default.mk 
     89        mv lib/MT.pm lib/MT.pm.pre 
    9090        sed -e 's!__BUILD_LANGUAGE__!$(BUILD_LANGUAGE)!g' \ 
    9191            -e 's!__PRODUCT_CODE__!$(PRODUCT_CODE)!g' \ 
    …… 
    9393            -e 's!__PRODUCT_VERSION__!$(PRODUCT_VERSION)!g' \ 
    9494            -e 's!__PRODUCT_VERSION_ID__!$(BUILD_VERSION_ID)!g' \ 
     95                -e 's!__BUILD_ID__!$(BUILD_VERSION_ID)!g' \ 
    9596            -e 's!__SCHEMA_VERSION__!$(SCHEMA_VERSION)!g' \ 
    9697            -e 's!__API_VERSION__!$(API_VERSION)!g' \ 
    …… 
    106107            -e 's!__CATEGORY_NAME_NODASH__!$(CATEGORY_NAME_NODASH)!g' \ 
    107108            -e 's!__PUBLISH_CHARSET__!$(PUBLISH_CHARSET)!g' \ 
    108             $< > $@ 
     109            lib/MT.pm.pre > lib/MT.pm 
     110        rm lib/MT.pm.pre 
    109111 
    110 php/mt.php: %: %.pre build-language-stamp build/mt-dists/$(BUILD_PACKAGE).mk 
     112php/mt.php: build-language-stamp build/mt-dists/$(BUILD_PACKAGE).mk 
     113        mv php/mt.php php/mt.php.pre 
    111114        sed -e 's!__BUILD_LANGUAGE__!$(BUILD_LANGUAGE)!g' \ 
    112115            -e 's!__PUBLISH_CHARSET__!$(PUBLISH_CHARSET)!g' \ 
    …… 
    116119        -e 's!__API_VERSION__!$(API_VERSION)!g' \ 
    117120        -e 's!__DEFAULT_TIMEZONE__!$(DEFAULT_TIMEZONE)!g' \ 
    118         $< > $@ 
    119  
    120 mt-config.cgi-original: mt-config.cgi-original.pre build-language-stamp 
    121         sed -e 's!__BUILD_LANGUAGE__!$(BUILD_LANGUAGE)!g' \ 
    122             -e 's!__HELP_URL__!$(HELP_URL)!g' \ 
    123             -e 's!__PRODUCT_VERSION__!$(PRODUCT_VERSION)!g' \ 
    124         $< > $@ 
    125  
    126 mt-check.cgi: %: %.pre build-language-stamp 
    127         sed -e 's!__BUILD_LANGUAGE__!$(BUILD_LANGUAGE)!g' \ 
    128             -e 's!__PRODUCT_VERSION_ID__!$(BUILD_VERSION_ID)!g' \ 
    129         $< > $@ 
    130         chmod +x $@ 
     121        php/mt.php.pre > php/mt.php 
     122        rm php/mt.php.pre 
    131123 
    132124$(local_js): mt-static/mt_%.js: mt-static/mt.js lib/MT/L10N/%.pm 
    …… 
    135127$(latin1_modules): %-iso-8859-1.pm: %.pm 
    136128        iconv -f utf-8 -t iso-8859-1 $< > $@ 
    137  
    138 index.html: check build-language-stamp 
    139         cp index.html.en_US $@.pre 
    140         -cp index.html.$(BUILD_LANGUAGE) $@.pre 
    141         sed -e 's!__HELP_URL__!$(HELP_URL)!g' \ 
    142             -e 's!__PRODUCT_VERSION__!$(PRODUCT_VERSION)!g' \ 
    143         index.html.pre > index.html 
    144         rm $@.pre 
    145  
    146 readme.html: check build-language-stamp 
    147         cp readme.html.en_US $@.pre 
    148         -cp readme.html.$(BUILD_LANGUAGE) $@.pre 
    149         sed -e 's!__HELP_URL__!$(HELP_URL)!g' \ 
    150             -e 's!__PRODUCT_VERSION__!$(PRODUCT_VERSION)!g' \ 
    151         readme.html.pre > readme.html 
    152         rm $@.pre 
    153129 
    154130##### Other useful targets 
    …… 
    192168 
    193169clean: 
    194         -rm -rf lib/MT.pm mt-config.cgi-original mt-check.cgi $(latin1_modules) $(local_js) 
    195         -rm -rf php/mt.php 
     170        -rm -rf $(latin1_modules) $(local_js) 
    196171        -rm -rf mt-static/js/mt_core_compact.js 
    197172        -rm -rf mt-static/css/main.css mt-static/css/simple.css 
    198         -rm -rf index.html 
    199         -rm -rf readme.html 
    200173        -rm -rf MANIFEST 
    201174        -rm -rf build-language-stamp 

  • trunk/lib

    • Property svn:ignore deleted

  • trunk/lib/MT/App/Wizard.pm

    r2877 r2929  
    1010use base qw( MT::App ); 
    1111 
    12 use MT::Util qw( trim ); 
     12use MT::Util qw( trim browser_language ); 
    1313 
    1414sub id {'wizard'} 
    …… 
    4343    $app->set_no_cache; 
    4444    $app->{requires_login} = 0; 
     45     
     46    my $default_lang = $app->param('default_language') || browser_language(); 
     47    $app->set_language($default_lang); 
    4548 
    4649    my $mode = $app->mode; 
    …… 
    332335    $param{mt_static_exists} = $app->mt_static_exists; 
    333336    $param{static_file_path} = $static_file_path; 
     337       
     338    my $langs = $app->supported_languages; 
     339    my @languages; 
     340    my $curr_lang ||= $app->current_language || $app->config('DefaultLanguage'); 
     341    $curr_lang = 'en-us' if ( lc($curr_lang) eq 'en_us' ); 
     342    for my $tag ( keys %$langs ) { 
     343        ( my $name = $langs->{$tag} ) =~ s/\w+ English/English/; 
     344        my $row = { l_tag => $tag, l_name => $app->translate($name) }; 
     345        $row->{l_selected} = 1 if $curr_lang eq $tag; 
     346        push @languages, $row; 
     347    } 
     348    @languages = sort { $a->{l_name} cmp $b->{l_name} } @languages; 
     349    $param{languages} = \@languages; 
    334350 
    335351    return $app->build_page( "start.tmpl", \%param ); 
    …… 
    369385    $param->{'wizard_steps'} = $steps; 
    370386    $param->{'step'}         = $app->param('step'); 
     387    $param->{'default_language'} = $app->param('default_language'); 
     388    $param->{'default_language'} = $app->param('default_language'); 
    371389 
    372390    return $app->SUPER::build_page( $tmpl, $param ); 

  • trunk/lib/MT/I18N/default.pm

    r1524 r2929  
    2727sub DISPLAY_LENGTH_EDIT_ENTRY_TEXT_FROM_EXCERPT ()     { 50 } 
    2828sub DISPLAY_LENGTH_EDIT_ENTRY_TEXT_BREAK_UP ()         { 30 } 
     29 
     30sub PORTAL_URL()            { 'http://www.sixapart.com/movabletype/' } 
     31sub SUPPORT_URL()           { 'http://www.sixapart.com/movabletype/support/' } 
     32sub NEWS_URL()              { 'http://www.sixapart.com/movabletype/news/' } 
     33sub NEWSBOX_URL()           { 'http://www.sixapart.com/movabletype/news/mt4_news_widget.html' } 
     34sub LEARNINGNEWS_URL()      { 'http://learning.movabletype.org/newsbox.html' } 
     35sub CATEGORY_NAME_NODASH()  { 0 } 
     36sub DEFAULT_TIMEZONE()      { 0 } 
     37sub MAIL_ENCODING()         { 'ISO-8859-1' } 
     38sub LOG_EXPORT_ENCODING()   { '' } 
     39sub EXPORT_ENCODING()       { '' } 
     40sub PUBLISH_CHARSET()       { 'UTF-8' } 
    2941 
    3042my $ENCODING_NAMES = [ 

  • trunk/lib/MT/I18N/ja.pm

    r1524 r2929  
    2929sub DISPLAY_LENGTH_EDIT_ENTRY_TEXT_FROM_EXCERPT ()     { 25 } 
    3030sub DISPLAY_LENGTH_EDIT_ENTRY_TEXT_BREAK_UP ()         { 30 } 
     31 
     32sub PORTAL_URL()            { 'http://www.sixapart.jp/movabletype/' } 
     33sub SUPPORT_URL()           { 'http://www.sixapart.jp/movabletype/support/' } 
     34sub NEWS_URL()              { 'http://www.sixapart.jp/movabletype/' } 
     35sub NEWSBOX_URL()           { 'http://www.sixapart.jp/movabletype/news/newsbox.html' } 
     36sub LEARNINGNEWS_URL()      { 'http://www.movabletype.jp/newsbox.html' } 
     37sub CATEGORY_NAME_NODASH()  { 1 } 
     38sub DEFAULT_TIMEZONE()      { 9 } 
     39sub MAIL_ENCODING()         { 'ISO-2022-JP' } 
     40sub LOG_EXPORT_ENCODING()   { 'Shift_JIS' } 
     41sub EXPORT_ENCODING()       { 'Shift_JIS' } 
     42sub PUBLISH_CHARSET()       { 'UTF-8' } 
    3143 
    3244my $ENCODING_NAMES = [ 

  • trunk/lib/MT/Util.pm

    r2807 r2929  
    2626                 epoch2ts ts2epoch escape_unicode unescape_unicode 
    2727                 sax_parser trim ltrim rtrim asset_cleanup caturl multi_iter 
    28                  weaken log_time make_string_csv ); 
     28                 weaken log_time make_string_csv browser_language ); 
    2929 
    3030{ 
    …… 
    14521452$Languages{ja} = $Languages{jp}; 
    14531453 
     1454sub browser_language { 
     1455    my @browser_langs = $ENV{HTTP_ACCEPT_LANGUAGE} =~ m{ 
     1456        ( 
     1457                [a-z]{2}      # en 
     1458                (?:-[a-z]{2})?  # -us 
     1459        ) 
     1460        \s* 
     1461        (?: 
     1462                ; \s* q\s*=\s*  # ; q= 
     1463                (?:1|0\.[0-9]+)   # 0.xx or 1 
     1464        )? 
     1465    }xmsg; 
     1466    my $mt_langs = MT->supported_languages; 
     1467    foreach my $lang (@browser_langs) { 
     1468        if($mt_langs->{$lang}) { 
     1469            return $lang; 
     1470        } 
     1471         
     1472        $lang =~ m/(.*)-.*/s; 
     1473        if($mt_langs->{$1}) { 
     1474            return $1; 
     1475        } 
     1476    } 
     1477     
     1478    return 'en-us'; 
     1479} 
     1480 
    14541481sub launch_background_tasks { 
    14551482    return !($ENV{MOD_PERL} || $ENV{FAST_CGI} 

  • trunk/php

    • Property svn:ignore deleted

  • trunk/tmpl/cms/dialog/header.tmpl

    r2306 r2929  
    55<meta http-equiv="Content-Type" content="text/html; charset=<mt:var name="language_encoding">" /> 
    66<title><mt:loop name="page_titles"><mt:var name="bc_name" escape="html"> | </mt:loop><mt:var name="mt_product_name"></title> 
    7 <mt:if name="mt_debug"> 
     7<mt:unless name="optimize_ui"> 
    88    <link rel="stylesheet" href="<$mt:var name="static_uri"$>styles.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    99<mt:else> 
    1010    <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/main.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    11 </mt:if> 
     11</mt:unless> 
    1212<!--[if IE]> 
    1313<link rel="stylesheet" href="<$mt:var name="static_uri"$>css/hacks/ie.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    1414<![endif]--> 
    15 <mt:if name="mt_debug"> 
     15<mt:unless name="optimize_ui"> 
    1616<script type="text/javascript" src="<$mt:var name="static_uri"$>js/common/Core.js?v=<mt:var name="mt_version_id" escape="url">"></script> 
    1717<script type="text/javascript" src="<$mt:var name="static_uri"$>js/common/Timer.js?v=<mt:var name="mt_version_id" escape="url">"></script> 
    …… 
    3232<mt:else> 
    3333<script type="text/javascript" src="<$mt:var name="static_uri"$>js/mt_core_compact.js?v=<mt:var name="mt_version_id" escape="url">"></script> 
    34 </mt:if> 
     34</mt:unless> 
    3535<$mt:var name="html_head"$> 
    3636<script type="text/javascript" src="<mt:var name="static_uri">mt.js"></script> 

  • trunk/tmpl/cms/include/chromeless_header.tmpl

    r2704 r2929  
    77    <mt:unless name="cfg_exists"> 
    88    <link rel="icon" href="<$mt:var name="static_uri"$>images/favicon.ico" type="image/ico" /> 
    9         <mt:if name="mt_debug"> 
     9        <mt:unless name="optimize_ui"> 
    1010    <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/reset.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    1111    <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/utilities.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    …… 
    1414        <mt:else> 
    1515    <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/simple.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    16         </mt:if> 
     16        </mt:unless> 
    1717    <!--[if IE]> 
    1818    <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/hacks/ie.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 

  • trunk/tmpl/cms/include/header.tmpl

    r2784 r2929  
    1010    <link type="application/atom+xml" rel="alternate" <mt:if name="feed_name">title="<mt:var name="feed_name" escape="html">" </mt:if>href="<mt:var name="feed_url" escape="html">" /> 
    1111</mt:if> 
    12 <mt:if name="mt_debug"> 
     12<mt:unless name="optimize_ui"> 
    1313    <link rel="stylesheet" href="<$mt:var name="static_uri"$>styles.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    1414<mt:else> 
    1515    <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/main.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    16 </mt:if> 
     16</mt:unless> 
    1717    <!--[if IE]> 
    1818    <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/hacks/ie.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" /> 
    …… 
    2424    <link rel="stylesheet" href="<$mt:var name="static_uri"$>styles_<$mt:var name="local_lang_id"$>.css?v=<mt:var name="mt_version_id" escape="url">" /> 
    2525</mt:if> 
    26 <mt:if name="mt_debug"> 
     26<mt:unless name="optimize_ui"> 
    2727    <script type="text/javascript" src="<$mt:var name="static_uri"$>js/common/Core.js?v=<mt:var name="mt_version_id" escape="url">"></script> 
    2828    <script type="text/javascript" src="<$mt:var name="static_uri"$>js/common/JSON.js?v=<mt:var name="mt_version_id" escape="url">"></script> 
    …… 
    4343<mt:else> 
    4444    <script type="text/javascript" src="<$mt:var name="static_uri"$>js/mt_core_compact.js?v=<mt:var name="mt_version_id" escape="url">"></script> 
    45 </mt:if> 
     45</mt:unless> 
    4646    <script type="text/javascript"> 
    4747        /* <![CDATA[ */ 

  • trunk/tmpl/wizard/blog.tmpl

    r2704 r2929  
    2323<input type="hidden" name="step" value="setup_blog" /> 
    2424<input type="hidden" name="set_static_uri_to" id="set_static_uri_to" value="<mt:var name="static_uri">" /> 
     25<input type="hidden" name="default_language" value="<mt:var name="default_language">" />     
    2526<input type="hidden" name="config" value="<mt:var name="config" escape="html">" /> 
    2627 

  • trunk/tmpl/wizard/cfg_dir.tmpl

    r2704 r2929  
    77<input type="hidden" name="step" value="cfg_dir" /> 
    88<input type="hidden" name="set_static_uri_to" id="set_static_uri_to" value="<mt:var name="static_uri">"> 
     9<input type="hidden" name="default_language" value="<mt:var name="default_language">" />     
    910<input type="hidden" name="config" value="<mt:var name="config" escape="html">" /> 
    1011 

  • trunk/tmpl/wizard/complete.tmpl

    r2704 r2929  
    3232<input type="hidden" name="config" value="<mt:var name="config" escape="html">" /> 
    3333<input type="hidden" name="set_static_uri_to" id="set_static_uri_to" value="<mt:var name=static_uri escape="html">"> 
     34<input type="hidden" name="default_language" value="<mt:var name="default_language">" />     
    3435 
    3536<mt:if name="file_not_found"> 

  • trunk/tmpl/wizard/configure.tmpl

    r2714 r2929  
    105105<input type="hidden" name="step" value="configure" /> 
    106106<input type="hidden" name="set_static_uri_to" id="set_static_uri_to" value="<mt:var name="static_uri">" /> 
     107<input type="hidden" name="default_language" value="<mt:var name="default_language">" />     
    107108<input type="hidden" name="config" value="<mt:var name="config" escape="html">" /> 
    108109 

  • trunk/tmpl/wizard/mt-config.tmpl

    r1678 r2929  
    4343SendMailPath <mt:var name="sendmail_path"></mt:if></mt:if></mt:if><mt:if name="temp_dir"> 
    4444 
    45 TempDir <mt:var name="temp_dir"></mt:if><mt:loop name="tmpl_loop"> 
     45TempDir <mt:var name="temp_dir"></mt:if><mt:if name="default_language"> 
     46     
     47DefaultLanguage <mt:var name="default_language"></mt:if><mt:loop name="tmpl_loop"> 
    4648 
    4749<mt:var name="tmpl_code"></mt:loop> 

  • trunk/tmpl/wizard/optional.tmpl

    r2704 r2929  
    66<input type="hidden" name="step" value="optional" /> 
    77<input type="hidden" name="set_static_uri_to" id="set_static_uri_to" value="<mt:var name="static_uri" escape="html">" /> 
     8<input type="hidden" name="default_language" value="<mt:var name="default_language">" />     
    89<input type="hidden" name="config" value="<mt:var name="config" escape="html">" /> 
    910 

  • trunk/tmpl/wizard/packages.tmpl

    r2484 r2929  
    4545<input type="hidden" name="config" value="<$mt:var name="config" escape="html"$>" /> 
    4646<input type="hidden" name="set_static_uri_to" value="<mt:var name="static_uri">" /> 
     47<input type="hidden" name="default_language" value="<mt:var name="default_language">" /> 
    4748 
    4849<mt:if name="missing_db"> 

  • trunk/tmpl/wizard/start.tmpl

    r2704 r2929  
    176176 
    177177    <p class="intro"><__trans phrase="This wizard will help you configure the basic settings needed to run Movable Type."></p> 
     178     
     179    <mtapp:setting 
     180                id="default_language" 
     181                label="<__trans phrase="Language">" 
     182                hint="<__trans phrase="Default language.">"> 
     183                <select name="default_language" id="default_language" class="se" onchange="changeLanguage(this.form);"><mt:loop name="languages"> 
     184                    <option value="<mt:var name="l_tag">"<mt:if name="l_selected"> selected="selected"</mt:if>><mt:var name="l_name"></option></mt:loop> 
     185                </select> 
     186            </mtapp:setting> 
    178187 
    179188    <mt:if name="uri_invalid">