------------------------------------------------------------
revno: 1041
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Sun 2012-01-22 23:03:33 +0100
message:
installer apps improved
modified:
assets/apps/installer/defaults.php
assets/apps/installer/installer.php
assets/apps/installer/languages/en.pot
assets/apps/installer/languages/es.po
assets/apps/installer/library.php
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'assets/apps/installer/defaults.php'
--- assets/apps/installer/defaults.php 2012-01-19 23:04:29 +0000
+++ assets/apps/installer/defaults.php 2012-01-22 22:03:33 +0000
@@ -7,28 +7,29 @@
* Update po files, if you edit this values.
*
* In $INSTALLER_WELCOME_TEXT and $INSTALLER_REQUIREMENTS you can use
- * html tag, and all literal must be surround by _t(LITERTAL). Please, split literals by line.
+ * html tag, and all literal must be surround by $t->t("LITERAL"). Please, split literals by line.
*
* Remember: this file is php.
*/
// title tag for web page
-$INSTALLER_TITLE_TAG="Aiki Framework Installer";
+$INSTALLER_TITLE_TAG = $t->t("Aiki Framework Installer");
// title (h1) for web page
-$INSTALLER_TITLE ="Aiki Installer";
+$INSTALLER_TITLE = $t->t("Aiki Installer");
// Welcome text
-$INSTALLER_WELCOME_TEXT="<p>
-_t(<strong>Aiki Framework</strong> is an open source high-performance Web Application Framework for rapid web application development using Open Standards.)
-</p>";
+$INSTALLER_WELCOME_TEXT =
+ "<p>" .
+ $t->t("<strong>Aiki Framework</strong> is an open source high-performance Web Application Framework for rapid web application development using Open Standards.").
+ "</p>";
-// Requirments text
-$INSTALLER_REQUIREMENTS_TEXT="
-<h2>_t(Requirements)</h2>
-<p>_t(Before we start you need the following):</p>
-<ol>
-<li>_t(An empty database, with collation set to) <em>utf8_general_ci.</em></li>
-<li>_t(PHP 5.2 or above and Apache2).</li>
-<li>_t(mod_rewrite must be enabled inside apache2 httpd.conf)</li>
-</ol>";
+// Requirements text
+$INSTALLER_REQUIREMENTS_TEXT = "
+ <h2>" . $t->t("Requirements") . "</h2>
+ <p>" . $t->t("Before we start you need the following:"). "</p>
+ <ol>
+ <li>" . $t->t("An empty database, with collation set to") . "<em>utf8_general_ci.</em></li>
+ <li>" . $t->t("PHP 5.2 or above and Apache2"). "</li>
+ <li>" . $t->t("mod_rewrite must be enabled inside apache2 httpd.conf"). "</li>
+ </ol>";
=== modified file 'assets/apps/installer/installer.php'
--- assets/apps/installer/installer.php 2012-01-19 23:04:29 +0000
+++ assets/apps/installer/installer.php 2012-01-22 22:03:33 +0000
@@ -20,7 +20,9 @@
* @TODO use ezSQL,
* @TODO VERSION, REVISION,
* @TODO AIKI_LOG_DIR, AIKI_LOG_FILE,AIKI_LOG_PROFILE, AIKI_LOG_LEVEL;
- *
+ *
+ * @TODO a step for licences?
+ * @TODO a step for authors?
*/
@@ -30,8 +32,9 @@
* installer defines the steps necesary during install process.
*
* Steps:
- * 0 Checks if neccesary file exists, and there is not a previous config.php file,
- * 1 select language for installation
+ * 0 Checks if neccesary file exists, and there is not a previous config.php file
+ * (security check)
+ * 1 aiki welcome, requirement, select language for installation
* 2 Ask for setting
* 3 Create database. If can't do, go step 1.
* 4 Create config. If can't do, show config file.
@@ -63,22 +66,6 @@
$t = new TranslateUsingPo("en", "language",false);
$t->addDomain("installer","languages");
-// construct the select control to choose language
-$selectLanguage = "";
-$translations = $t->translations();
-if ( is_array($translations) && count($translations)>0 ){
- $options = "<option value='en'>English</option>";
-
- foreach ( $translations as $isoCode ){
- $options .= "<option value='$isoCode'>" . iso639($isoCode) ."</option>\n";
- }
- $selectLanguage=
- "<form id='f_language'><label for='language'>_t(Select language for installation)</label>\n" .
- "<select name='language' id='language' class='user-input'>".
- $options.
- "</select><input type='submit' value='_t(Change)'></form>";
-}
-
/*
* @TODO this must manually udpated..
@@ -117,7 +104,6 @@
}
-
/*
*
* templates for each step
@@ -129,56 +115,56 @@
include_once("defaults.php");
-$template[0]="<div class='error'>_t(Installation aborted)</div><div class='error'>%s</div>";
+$template[0]="<div class='error'>" . $t->t("Installation aborted")."</div><div class='error'>%s</div>";
+
$template[1]=
"<div id='welcome'>$INSTALLER_WELCOME_TEXT</div>
<div id='requirements'>$INSTALLER_REQUIREMENTS_TEXT</div>".
- $selectLanguage .
- form_hidden(2, "<input type='submit' class='button next' value='_t(Next): _t(Settings)'>");
+ select_language() .
+ form_hidden(2, "<input type='submit' class='button next' value=' " . $t->t("Next:") ." ". $t->t("Settings") . "'>");
$template[2]= "%s<form method='post'>
- <fieldset class='db'><legend>_t(Database)</legend>
+ <fieldset class='db'><legend>" . $t->t("Database")."</legend>
<p><label for='db_type'>SQL</label>" . select_db_type($config['db_type']) . "<span class='required'>*</span></p>
- <p><label for='db_host'>_t(Host)</label><input type='text' name='db_host' id='db_host' class='user-input' value='{$config['db_host']}'><span class='required'>*</span></p>
- <p><label for='db_name'>_t(Database name)</label><input type='text' name='db_name' id='db_name' class='user-input' value='{$config['db_name']}'><span class='required'>*</span></p>
- <p><label for='db_user'>_t(User)</label><input type='text' name='db_user' id='db_user' class='user-input' value='{$config['db_user']}'><span class='required'>*</span></p>
- <p><label for='db_pass'>_t(Password)</label><input type='password' name='db_pass' id='db_pass' class='user-input' value='{$config['db_pass']}'><span class='required'>*</span></p>
- <p><label for='db_encoding'>_t(Encoding)</label><input type='text' name='db_encoding' id='db_encoding' class='user-input' value='{$config['db_encoding']}'><span class='required'>*</span></p>
+ <p><label for='db_host'>" . $t->t("Host") ."</label><input type='text' name='db_host' id='db_host' class='user-input' value='{$config['db_host']}'><span class='required'>*</span></p>
+ <p><label for='db_name'>" . $t->t("Database name")."</label><input type='text' name='db_name' id='db_name' class='user-input' value='{$config['db_name']}'><span class='required'>*</span></p>
+ <p><label for='db_user'>" . $t->t("User") ."</label><input type='text' name='db_user' id='db_user' class='user-input' value='{$config['db_user']}'><span class='required'>*</span></p>
+ <p><label for='db_pass'>" . $t->t("Password") ."</label><input type='password' name='db_pass' id='db_pass' class='user-input' value='{$config['db_pass']}'><span class='required'>*</span></p>
+ <p><label for='db_encoding'>" . $t->t("Encoding") ."</label><input type='text' name='db_encoding' id='db_encoding' class='user-input' value='{$config['db_encoding']}'><span class='required'>*</span></p>
</fieldset>
- <fieldset class='other'><legend>_t(Admin user / Site)</legend>
- <p><label for='ADMIN_USER'>_t(Login)</label><input type='text' name='ADMIN_USER' id='ADMIN_USER' class='user-input' value='{$config['ADMIN_USER']}'></p>
- <p><label for='ADMIN_FULLNAME'>_t(Full name)</label> <input type='text' name='SITE_TITLE' id='SITE_TITLE' class='user-input' value='{$config['ADMIN_FULLNAME']}'></p>
- <p><label for='ADMIN_EMAIL'>_t(Email)</label> <input type='text' name='ADMIN_EMAIL' id='ADMIN_EMAIL' class='user-input' value='{$config['ADMIN_EMAIL']}'></p>
- <p class='note'>_t(Aiki will send login and password using this email).</p>
+ <fieldset class='other'><legend>" . $t->t("Admin user / Site") ."</legend>
+ <p><label for='ADMIN_USER'>" . $t->t("Login")."</label><input type='text' name='ADMIN_USER' id='ADMIN_USER' class='user-input' value='{$config['ADMIN_USER']}'></p>
+ <p><label for='ADMIN_FULLNAME'>" . $t->t("Full name")."</label> <input type='text' name='SITE_TITLE' id='SITE_TITLE' class='user-input' value='{$config['ADMIN_FULLNAME']}'></p>
+ <p><label for='ADMIN_EMAIL'>" . $t->t("Email")."</label> <input type='text' name='ADMIN_EMAIL' id='ADMIN_EMAIL' class='user-input' value='{$config['ADMIN_EMAIL']}'></p>
+ <p class='note'>" . $t->t("Aiki will send login and password using this email.") ."</p>
</fieldset>
<input type='hidden' name='step' value='3'>
- <p class='required'><span class='required'>*</span> _t(Required Fields)</p>
+ <p class='required'><span class='required'>*</span> " . $t->t("Required Fields") ."</p>
<div class='actions'>
- <input type='submit' value='_t(Test connection)' class='button' name='testDB'>
- <input type='submit' value='_t(Next): _t(Create database)' class='button next'>
+ <input type='submit' value='" . $t->t("Test connection"). "' class='button' name='testDB'>
+ <input type='submit' value='" . $t->t("Next:") ." ". $t->t("Create database"). "' class='button next'>
</div>
</form>";
// removed: <p><label for='SITE_URL'>Site url</label> <input type='text' name='SITE_URL' id='SITE_URL' class='user-input' value='{$config['SITE_URL']}'></p>
-$template[3]= "%s " . form_hidden(4, "<input type='submit' class='button next' value='_t(Next): _t(Write configuration)'>");
-$template[4]= "%s " . form_hidden(5, "<input type='submit' class='button next' value='_t(Next): _t(Pretty urls)'>");
+$template[3]= "%s " . form_hidden(4, "<input type='submit' class='button next' value='" . $t->t("Next:")." " . $t->t("Write configuration") ."'>");
+$template[4]= "%s " . form_hidden(5, "<input type='submit' class='button next' value='" . $t->t("Next:")." " . $t->t("Pretty urls"). "'>");
$template[5]= "%s <div class='actions'>%s</div>";
// Description of steps
$steps = array (
- 0=>"Pre-installation check",
- 1=>"Requirements & language",
- 2=>"Settings",
- 3=>"Create database",
- 4=>"Config file",
- 5=>"Pretty urls");
-
-
+ 0=> $t->t("Pre-installation check"),
+ 1=> $t->t("Requirements & language"),
+ 2=> $t->t("Settings"),
+ 3=> $t->t("Create database"),
+ 4=> $t->t("Config file"),
+ 5=> $t->t("Pretty urls")
+ );
/*
* Installer work starts here
@@ -203,14 +189,9 @@
$step=1;
}
-$message = "";
$aditional= ""; // for aditional buttons
$help = ""; // help info.
-
-$message = check_step($step);
-if ($message ) {
- $step=0;
-}
+$message = check_step($step);
/*
* ACTION FOR EACH STEP
@@ -228,19 +209,19 @@
$test = isset($_POST["testDB"]);
if ( !$config['db_host'] || !$config['db_user'] ) {
- $message = "<div class='error'>_t(Please, fill all required fields)</div>";
+ $message = "<div class='error'>" . $t->t("Please, fill all required fields")."</div>";
} elseif ( !@mysql_connect ($config['db_host'], $config['db_user'], $config['db_pass']) ) {
- $message = "<div class='error'>_t(Error: no connection)</div>";
+ $message = "<div class='error'>" . $t->t("Error: no connection")."</div>";
} elseif ( !@mysql_selectdb ($config['db_name']) ){
$message = ( $test ?
- "<div class='ok'>_t(Connection OK)</div><div class='error'>_t(no database name)</div>":
- "<div class='error'>_t(Error: can't select database)</div>" );
+ "<div class='ok'>" . $t->t("Connection OK")."</div><div class='error'>" . $t->t("no database name")."</div>":
+ "<div class='error'>" . $t->t("Error: can't select database")."</div>" );
} else {
if ( $test ) {
- $message = "<div class='ok'> _t(Connection and database OK)</div>";
+ $message = "<div class='ok'>" . $t->t("Connection and database OK")."</div>";
} else {
$step=3;
- $message = "<div class='message'><p><strong>_t(created tables)</strong><br><div id='file-list'>";
+ $message = "<div class='message'><p><strong>" . $t->t("created tables")."</strong><br><div id='file-list'>";
$errors="";
$cont =0;
@@ -257,7 +238,7 @@
if ( mysql_query($sql) ) {
$message .= " <strong>Ok</strong><br>";
} else {
- $message .="<span class='error'>_t(error)</span><br>";
+ $message .="<span class='error'>" . $t->t("error")."</span><br>";
$errors .= "<br>". mysql_error() ;
}
$cont++;
@@ -267,23 +248,23 @@
}
$message .= ($cont ? "</div>" : "") . "</div></div>";
- $userData = "_t(Admin login): {$config['ADMIN_USER']}<br>_t(Password): {$config['ADMIN_PASSWORD']}";
- $help = "<div class='help'>_t(<strong>Please, annotate</strong> login and password. You will need them)</div>";
+ $userData = $t->t("Admin login:") . " {$config['ADMIN_USER']}<br>" . $t->t("Password:"). " {$config['ADMIN_PASSWORD']}";
+ $help = "<div class='help'>" . $t->t("<strong>Please, annotate</strong> login and password. You will need them")."</div>";
if ( send_data_by_email() ){
- $help .= "<div class='help'>_t(Data had send to ){$config['ADMIN_EMAIL']}</div>";
+ $help .= "<div class='help'>" . sprintf( $t->t("Data had send to %s"),$config['ADMIN_EMAIL']) ."</div>";
}
if ( $errors ) {
$message = "<div class='ok'>$userData</div>".
- "<div class='error'>_t(Some errors during creating tables <em>,perhaps tables already exists</em>)</div>"
+ "<div class='error'>" . $t->t("Some errors during creating tables <em>,perhaps tables already exists</em>")."</div>"
. $message
. "<textarea class='file_dump'>$errors</textarea>";
- $aditional = "<input type='submit' name='try_step_2' value='_t(Try again)' class='button' >";
- $help .= "<div class='help'>_t(Delete all tables for new installtion, or push next for upgrading)</div>";
+ $aditional = "<input type='submit' name='try_step_2' value='" . $t->t("Try again") ."' class='button' >";
+ $help .= "<div class='help'>" . $t->t("Delete all tables for new installtion, or push next for upgrading")."</div>";
} else {
- $message = "<div class='ok'>_t(All tables was created correctly)<em>$userData</em></div>" . $message;
+ $message = "<div class='ok'>" . $t->t("All tables have created correctly")." <em>$userData</em></div>" . $message;
}
@@ -296,8 +277,8 @@
$config_file = file_get_contents("$AIKI_ROOT_DIR/configs/config.php");
if ( false == $config_file ) {
// file exists had been checked ..but can fails
- $message = "<div class='error'>t(FATAL ERROR: failed to read config template file)".
- "<em>_t(Path) $AIKI_ROOT_DIR/configs/config.php</em></div>";
+ $message = "<div class='error'>" . $t->t("FATAL ERROR: failed to read config template file").
+ "<em>" . $t->t("Path"). " $AIKI_ROOT_DIR/configs/config.php</em></div>";
break;
}
@@ -313,13 +294,13 @@
$config_file = strtr($config_file, $replace);
if ( @file_put_contents ( "$AIKI_ROOT_DIR/config.php", $config_file) ){
- $message="<div class='ok'>_t(Config file created).</div>";
+ $message="<div class='ok'>" . $t->t("Config file created.")."</div>";
} else {
- $aditional = "<input type='submit' name='try_step_3' value='_t(Try again)' class='button' >";
+ $aditional = "<input type='submit' name='try_step_3' value='" . $t->t("Try again")."' class='button' >";
$message=
- "<div class='error'>_t(can't write config file:) <em>_t(Path): $AIKI_ROOT_DIR/config.php </em></div>".
- "<div class='message'><p>_t(Please, copy this code, create file and paste).</p><textarea class='filedump'>". $config_file . "</textarea></div>";
- $help = "<div class='help'>_t(Check permission in directory)</div>";
+ "<div class='error'>" . $t->t("can't write config file:")." <em>" . $t->t("Path:") ." $AIKI_ROOT_DIR/config.php </em></div>".
+ "<div class='message'><p>" . $t->t("Please, copy this code, create file and paste.")."</p><textarea class='filedump'>". $config_file . "</textarea></div>";
+ $help = "<div class='help'>" . $t->t("Check permission in directory")."</div>";
}
break;
@@ -328,33 +309,33 @@
$htaccess_file = get_new_htaccess($AIKI_ROOT_DIR);
if ( file_exists($AIKI_ROOT_DIR ."/.htaccess" ) ) {
- if ( file_get_contents($AIKI_ROOT_DIR ."/.htaccess") == $htaccess_file ){
- $message= "<div class='ok'>_t(Installation finished <em>pretty urls are enabled with previous .htaccess</em>)</div>";
- $aditional="<a href='{$AIKI_SITE_URL}' class='button'>_t(Test my site!!)</a>";
+ if ( @file_get_contents($AIKI_ROOT_DIR ."/.htaccess") == $htaccess_file ){
+ $message= "<div class='ok'>" . $t->t("Installation finished <em>pretty urls are enabled with previous .htaccess</em>")."</div>";
+ $aditional="<a href='{$AIKI_SITE_URL}' class='button'>" . $t->t("Test my site!!")."</a>";
} else {
- $aditional= "<input type='submit' name='try_step_4' value='_t(Try/Check again)' class='button' >";
- $message = "<div class='error'>_t(There is a existing .htaccess file)</div>".
- "<div class='message'><p>_t(Please, remove file or rewrite file with this code):</p><textarea class='filedump'>". $htaccess_file . "</textarea></div>";
+ $aditional= "<input type='submit' name='try_step_4' value='" . $t->t("Try/Check again") ."' class='button' >";
+ $message = "<div class='error'>" . $t->t("There is a existing .htaccess file.")."</div>".
+ "<div class='message'><p>" . $t->t("Please, remove file or rewrite file with this code:")."</p><textarea class='filedump'>". $htaccess_file . "</textarea></div>";
}
break;
} else {
if ( !$htaccess_file ) {
- $message = "<div class='error'>_t(FATAL ERROR: failed to read htaccess.inc file)"-
- "<em>_t(Path) $AIKI_ROOT_DIR/configs/config.php</em></div>";
+ $message = "<div class='error'>" . $t->t("FATAL ERROR: failed to read htaccess.inc file") .
+ "<em>" . $t->t("Path"). " $AIKI_ROOT_DIR/configs/config.php</em></div>";
break;
}
if ( @file_put_contents ( "$AIKI_ROOT_DIR/.htaccess", $htaccess_file) ){
- $message= "<div class='ok'>_t(Installation finished <em>pretty urls are enabled</em>)</div>";
- $aditional="<a href='{$AIKI_SITE_URL}' class='button'>_t(Test my site!!)</a>";
+ $message= "<div class='ok'>" . $t->t("Installation finished <em>pretty urls are enabled.</em>")."</div>";
+ $aditional="<a href='{$AIKI_SITE_URL}' class='button'>" . $t->t("Test my site!!")."</a>";
} else {
- $aditional= "<input type='submit' name='try_step_4' value='_t(Try again)' class='button' >";
+ $aditional= "<input type='submit' name='try_step_4' value='" . $t->t("Try again")."' class='button' >";
$message=
- "<div class='error'>_t(Aiki can't write .htaccess file): <em>_t(Path): $AIKI_ROOT_DIR/.htaccess</em></div>".
- "<div class='message'><p>_t(Please, copy this code, create file and paste).</p><textarea class='filedump'>". $htaccess_file . "</textarea></div>";
- $help = "<div class='help'>_t(Check permission in directory)</div>";
+ "<div class='error'>" . $t->t("Aiki can't write .htaccess file:")." <em>" . $t->t("Path") ." $AIKI_ROOT_DIR/.htaccess</em></div>".
+ "<div class='message'><p>" . $t->t("Please, copy this code, create file and paste.")."</p><textarea class='filedump'>". $htaccess_file . "</textarea></div>";
+ $help = "<div class='help'>" . $t->t("Check permission in directory")."</div>";
}
}
break;
@@ -365,7 +346,7 @@
// internationalization
-$language= $t->translateTo();
+$language = $t->translateTo();
$css = $t->t("installer.css");
$text_direction= $t->t("dir='ltr'");
// note: which css to use, and text direction can be set in .po file
@@ -378,23 +359,25 @@
<!DOCTYPE HTML>
<html lang="{$language}" {$text_direction}>
<head>
- <title>_t({$INSTALLER_TITLE_TAG})</title>
+ <title>_{$INSTALLER_TITLE_TAG}</title>
<meta charset='utf-8' >
<link rel='stylesheet' href='./{$css}' type="text/css" media="all">
</head>
<body>
<div id="page">
- <h1>_t({$INSTALLER_TITLE})<em><strong>{$stepOf}</strong> | _t({$steps[$step]})</em></strong></h1>
+ <h1>{$INSTALLER_TITLE}<em><strong>{$stepOf}</strong> | {$steps[$step]} </em></strong></h1>
$result
</div>
</body>
</html>
HTML;
-// make translation and echo
+echo $html;
+
+/* make translation and echo
echo preg_replace_callback (
"/_t\(([^\)]*)\)/", // all _t(literals)
array($t,"t"), // will be translated by $t->t()
- $html );
+ $html );*/
?>
=== modified file 'assets/apps/installer/languages/en.pot'
--- assets/apps/installer/languages/en.pot 2012-01-19 23:04:29 +0000
+++ assets/apps/installer/languages/en.pot 2012-01-22 22:03:33 +0000
@@ -3,280 +3,334 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
+#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-18 00:03+0100\n"
+"POT-Creation-Date: 2012-01-22 22:32+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../installer.php:42
-msgid "install.css"
-msgstr ""
-
-#: text direction: ltr or rtl
-msgid "dir='ltr'"
-msgstr ""
-
-msgid "Aiki Installer"
-msgstr ""
-
-msgid "Aiki Framework Installer"
-msgstr ""
-
-msgid "<strong>Aiki Framework</strong> is an open source high-performance Web Application Framework for rapid web application development using Open Standards."
-msgstr ""
-
-#: ../installer.php:42
-msgid "Select language for installation"
-msgstr ""
-
-#: ../installer.php:45
-msgid "Change"
-msgstr ""
-
-#: ../installer.php:81
-msgid "adminstrator"
-msgstr ""
-
-#: ../installer.php:115
-#, php-format
+#: ../installer.php:118
msgid "Installation aborted"
msgstr ""
-#: ../installer.php:116
-msgid "Requirements"
-msgstr ""
-
-msgid "Before we start you need the following"
-msgstr ""
-
-msgid "An empty database, with collation set to"
-msgstr ""
-
-msgid "PHP 5.2 or above and Apache2"
-msgstr ""
-
-msgid "mod_rewrite must be enabled inside apache2 httpd.conf"
-msgstr ""
-
-#: ../installer.php:126
-msgid "Admin user / Site"
-msgstr ""
-
+#: ../installer.php:125 ../installer.php:149 ../installer.php:154
+#: ../installer.php:155
+msgid "Next:"
+msgstr ""
+
+#: ../installer.php:125 ../installer.php:163
+msgid "Settings"
+msgstr ""
+
+#: ../installer.php:128
+msgid "Database"
+msgstr ""
+
+#: ../installer.php:130
msgid "Host"
msgstr ""
-msgid "Database"
-msgstr ""
-
+#: ../installer.php:131
msgid "Database name"
msgstr ""
+#: ../installer.php:132
+msgid "User"
+msgstr ""
+
+#: ../installer.php:133 ../library.php:395
msgid "Password"
msgstr ""
+#: ../installer.php:134
msgid "Encoding"
msgstr ""
-msgid "Test connection"
-msgstr ""
-
-msgid "Required Fields"
-msgstr ""
-
+#: ../installer.php:137
+msgid "Admin user / Site"
+msgstr ""
+
+#: ../installer.php:138
msgid "Login"
msgstr ""
+#: ../installer.php:139
msgid "Full name"
msgstr ""
-msgid "User"
-msgstr ""
-
-msgid "Aiki will send login and password using this email"
-msgstr ""
-
-#: ../installer.php:126
-msgid "Next"
-msgstr ""
-
-
-#: ../installer.php:156
+#: ../installer.php:140
+msgid "Email"
+msgstr ""
+
+#: ../installer.php:141
+msgid "Aiki will send login and password using this email."
+msgstr ""
+
+#: ../installer.php:145
+msgid "Required Fields"
+msgstr ""
+
+#: ../installer.php:148
+msgid "Test connection"
+msgstr ""
+
+#: ../installer.php:149 ../installer.php:164
+msgid "Create database"
+msgstr ""
+
+#: ../installer.php:154
msgid "Write configuration"
msgstr ""
+#: ../installer.php:155 ../installer.php:166
+msgid "Pretty urls"
+msgstr ""
-#: ../installer.php:163
+#: ../installer.php:161
msgid "Pre-installation check"
msgstr ""
-#: ../installer.php:164
+#: ../installer.php:162
msgid "Requirements & language"
msgstr ""
-#: ../installer.php:126
#: ../installer.php:165
-msgid "Settings"
-msgstr ""
-
-#: ../installer.php:166
-msgid "Create database"
-msgstr ""
-
-#: ../installer.php:167
msgid "Config file"
msgstr ""
-#: ../installer.php:168
-msgid "Pretty urls"
+#: ../installer.php:212
+msgid "Please, fill all required fields"
msgstr ""
-#: ../installer.php:193
+#: ../installer.php:214 ../library.php:322
msgid "Error: no connection"
msgstr ""
-#: ../installer.php:195
-msgid "Error: no database selected"
-msgstr ""
-
-
-#: ../installer.php:204
-msgid "There is a existing configuration file"
-msgstr ""
-
-msgid "Please remove file to continue installation"
-msgstr ""
-
-
-
-#: ../installer.php:250
-msgid "Go to"
-msgstr ""
-#: ../installer.php:254
-msgid "Have a nice day"
-msgstr ""
-
-#: ../installer.php:261
-msgid "Your new Aiki installation"
-msgstr ""
-
-#: ../installer.php:320 ../installer.php:321
-msgid "step"
-msgstr ""
-
-#: ../installer.php:357
-msgid "Please, fill all required fields"
-msgstr ""
-
-#: ../installer.php:362
+#: ../installer.php:217
msgid "Connection OK"
msgstr ""
-#: ../installer.php:362
+#: ../installer.php:217
msgid "no database name"
msgstr ""
-#: ../installer.php:363
+#: ../installer.php:218
msgid "Error: can't select database"
msgstr ""
-#: ../installer.php:366
+#: ../installer.php:221
msgid "Connection and database OK"
msgstr ""
-#: ../installer.php:369
+#: ../installer.php:224
msgid "created tables"
msgstr ""
-
-#: ../installer.php:383
+#: ../installer.php:241
msgid "error"
msgstr ""
-msgid "Admin login"
-msgstr ""
-
-#: ../installer.php:394
-msgid "<strong>Please, annotate</strong> login and password. You will need them"
-msgstr ""
-
-#: ../installer.php:402
-msgid "Some errors during creating tables <em>,perhaps tables already exists</em>"
-msgstr ""
-
-#: ../installer.php:407
+#: ../installer.php:251
+msgid "Admin login:"
+msgstr ""
+
+#: ../installer.php:251
+msgid "Password:"
+msgstr ""
+
+#: ../installer.php:252
+msgid ""
+"<strong>Please, annotate</strong> login and password. You will need them"
+msgstr ""
+
+#: ../installer.php:255
+#, php-format
+msgid "Data had send to %s"
+msgstr ""
+
+#: ../installer.php:260
+msgid ""
+"Some errors during creating tables <em>,perhaps tables already exists</em>"
+msgstr ""
+
+#: ../installer.php:264 ../installer.php:299 ../installer.php:334
+msgid "Try again"
+msgstr ""
+
+#: ../installer.php:265
msgid "Delete all tables for new installtion, or push next for upgrading"
msgstr ""
-msgid "All tables was created correctly"
+#: ../installer.php:267
+msgid "All tables have created correctly"
msgstr ""
-#: ../installer.php:422
+#: ../installer.php:280
msgid "FATAL ERROR: failed to read config template file"
msgstr ""
-#: ../installer.php:439
-msgid "Config file created"
-msgstr ""
-
-#: ../installer.php:406
-#: ../installer.php:441
-msgid "Try again"
-msgstr ""
-
-#: ../installer.php:444
-msgid "Please, copy this code, create file and paste"
-msgstr ""
-
-#: ../installer.php:445 ../installer.php:480
+#: ../installer.php:281 ../installer.php:326 ../installer.php:336
+msgid "Path"
+msgstr ""
+
+#: ../installer.php:297
+msgid "Config file created."
+msgstr ""
+
+#: ../installer.php:301
+msgid "can't write config file:"
+msgstr ""
+
+#: ../installer.php:301
+msgid "Path:"
+msgstr ""
+
+#: ../installer.php:302 ../installer.php:337
+msgid "Please, copy this code, create file and paste."
+msgstr ""
+
+#: ../installer.php:303 ../installer.php:338
msgid "Check permission in directory"
msgstr ""
-#: ../installer.php:455
-msgid "Installation finished <em>pretty urls are enabled with "
-"previous .htaccess</em>"
-msgstr ""
-
-#: ../installer.php:458
+#: ../installer.php:313
+msgid ""
+"Installation finished <em>pretty urls are enabled with previous .htaccess</"
+"em>"
+msgstr ""
+
+#: ../installer.php:314 ../installer.php:332
+msgid "Test my site!!"
+msgstr ""
+
+#: ../installer.php:316
msgid "Try/Check again"
msgstr ""
-#: ../installer.php:459
-msgid "There is a existing .htaccess file"
-msgstr ""
-
-#: ../installer.php:459
-msgid "Please, remove file or rewrite file with this code"
-msgstr ""
-
-#: ../installer.php:467
+#: ../installer.php:317
+msgid "There is a existing .htaccess file."
+msgstr ""
+
+#: ../installer.php:318
+msgid "Please, remove file or rewrite file with this code:"
+msgstr ""
+
+#: ../installer.php:325
msgid "FATAL ERROR: failed to read htaccess.inc file"
msgstr ""
-#: ../installer.php:473
-msgid "Installation finished <em>pretty urls are enabled</em>"
-msgstr ""
-
-msgid "Installation finished <em>pretty urls are enabled with previous .htaccess</em>"
-msgstr ""
-
-msgid "Test my site!!"
-msgstr ""
-
-#: ../installer.php:491
+#: ../installer.php:331
+msgid "Installation finished <em>pretty urls are enabled.</em>"
+msgstr ""
+
+#: ../installer.php:336
+msgid "Aiki can't write .htaccess file:"
+msgstr ""
+
+#: ../installer.php:350
+msgid "installer.css"
+msgstr ""
+
+#: ../installer.php:351
+msgid "dir='ltr'"
+msgstr ""
+
+#: ../installer.php:355
+#, php-format
msgid "Step %d of %d"
msgstr ""
-
-msgid "can't write config file:"
-msgstr ""
-
-msgid "Path"
-msgstr "directorio"
+#: ../library.php:271
+msgid "Select language for installation"
+msgstr ""
+
+#: ../library.php:274
+msgid "Change"
+msgstr ""
+
+#: ../library.php:293
+msgid "oracle 8 or higher"
+msgstr ""
+
+#: ../library.php:325
+msgid "Error: no database selected"
+msgstr ""
+
+#: ../library.php:335
+msgid "There is a existing configuration file."
+msgstr ""
+
+#: ../library.php:336
+msgid "Please remove file to continue installation"
+msgstr ""
+
+#: ../library.php:357
+msgid "Essential files missing"
+msgstr ""
+
+#: ../library.php:391
+msgid "Hello"
+msgstr ""
+
+#: ../library.php:392
+msgid "Your new Aiki installation is ready to be used"
+msgstr ""
+
+#: ../library.php:393
+msgid "Go to"
+msgstr ""
+
+#: ../library.php:394
+msgid "Username"
+msgstr ""
+
+#: ../library.php:396
+msgid "Have a nice day"
+msgstr ""
+
+#: ../library.php:398
+msgid "Your new Aiki installation"
+msgstr ""
+
+#: ../defaults.php:16
+msgid "Aiki Framework Installer"
+msgstr ""
+
+#: ../defaults.php:19
+msgid "Aiki Installer"
+msgstr ""
+
+#: ../defaults.php:24
+msgid ""
+"<strong>Aiki Framework</strong> is an open source high-performance Web "
+"Application Framework for rapid web application development using Open "
+"Standards."
+msgstr ""
+
+#: ../defaults.php:29
+msgid "Requirements"
+msgstr ""
+
+#: ../defaults.php:30
+msgid "Before we start you need the following:"
+msgstr ""
+
+#: ../defaults.php:32
+msgid "An empty database, with collation set to"
+msgstr ""
+
+#: ../defaults.php:33
+msgid "PHP 5.2 or above and Apache2"
+msgstr ""
+
+#: ../defaults.php:34
+msgid "mod_rewrite must be enabled inside apache2 httpd.conf"
+msgstr ""
=== modified file 'assets/apps/installer/languages/es.po'
--- assets/apps/installer/languages/es.po 2012-01-19 23:04:29 +0000
+++ assets/apps/installer/languages/es.po 2012-01-22 22:03:33 +0000
@@ -7,286 +7,337 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-18 00:03+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-01-22 22:32+0100\n"
+"PO-Revision-Date: 2012-01-22 22:57+0100\n"
+"Last-Translator: Roger Martin <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-
-#: ../installer.php:42
-msgid "install.css"
-msgstr ""
-
-#: text direction: ltr or rtl
-msgid "dir='ltr'"
-msgstr ""
-
-msgid "Aiki Installer"
-msgstr "Instalación de Aiki"
-
-msgid "Aiki Framework Installer"
-msgstr "Instalación del framework Aiki"
-
-
-msgid "<strong>Aiki Framework</strong> is an open source high-performance Web Application Framework for rapid web application development using Open Standards."
-msgstr "<p><strong>Aiki Framework</strong> es un framework de codigo abierto de alto rendimiento para rápido desarrollo de aplicaciones web usando Estandares Abiertos</p>"
-
-#: ../installer.php:42
-msgid "Select language for installation"
-msgstr "Selecciona lenguage"
-
-#: ../installer.php:45
-msgid "Change"
-msgstr "Cambiar"
-
-#: ../installer.php:81
-msgid "adminstrator"
-msgstr "adminstrador"
-
-#: ../installer.php:115
-#, php-format
+#: ../installer.php:118
msgid "Installation aborted"
-msgstr "Instalación cancelara"
-
-#: ../installer.php:116
-msgid "Requirements"
-msgstr "Requisitos"
-
-msgid "Before we start you need the following"
-msgstr "Antes de empezar necesitarás"
-
-msgid "An empty database, with collation set to"
-msgstr "Una base de datos vacia, con cotejo (collation set)"
-
-msgid "PHP 5.2 or above and Apache2"
-msgstr "PHP 5.2 o superior y Apache2"
-
-msgid "mod_rewrite must be enabled inside apache2 httpd.conf"
-msgstr "mod_rewrite debe esta habilitado"
-
-#: ../installer.php:126
-msgid "Admin user / Site"
-msgstr "Usuario adminstrador / sitio"
-
+msgstr "Instalación cancelada"
+
+#: ../installer.php:125
+#: ../installer.php:149
+#: ../installer.php:154
+#: ../installer.php:155
+msgid "Next:"
+msgstr "Siguiente:"
+
+#: ../installer.php:125
+#: ../installer.php:163
+msgid "Settings"
+msgstr "Configuraciones"
+
+#: ../installer.php:128
+msgid "Database"
+msgstr "Base de datos"
+
+#: ../installer.php:130
msgid "Host"
msgstr "Servidor"
-msgid "Database"
-msgstr "Base de datos"
-
+#: ../installer.php:131
msgid "Database name"
msgstr "Nombre de la base de datos"
+#: ../installer.php:132
+msgid "User"
+msgstr "Usuario"
+
+#: ../installer.php:133
+#: ../library.php:395
msgid "Password"
msgstr "Contraseña"
+#: ../installer.php:134
msgid "Encoding"
msgstr "Codificación"
-msgid "Test connection"
-msgstr "Probar conexión"
-
-msgid "Required Fields"
-msgstr "Campos obligatorios"
-
+#: ../installer.php:137
+msgid "Admin user / Site"
+msgstr "Administrador / Sitio"
+
+#: ../installer.php:138
msgid "Login"
-msgstr ""
+msgstr "Login"
+#: ../installer.php:139
msgid "Full name"
msgstr "Nombre completo"
-msgid "User"
-msgstr "Usuario"
-
-msgid "Aiki will send login and password using this email"
-msgstr "Aiki enviará los datos de login y contraseña a este email"
-
-#: ../installer.php:126
-msgid "Next"
-msgstr "Siguiente"
-
-
-#: ../installer.php:156
+#: ../installer.php:140
+msgid "Email"
+msgstr "Email"
+
+#: ../installer.php:141
+msgid "Aiki will send login and password using this email."
+msgstr "Aiki enviará el login y contraseña a este email"
+
+#: ../installer.php:145
+msgid "Required Fields"
+msgstr "Campos obligatorios"
+
+#: ../installer.php:148
+msgid "Test connection"
+msgstr "Probar conexión"
+
+#: ../installer.php:149
+#: ../installer.php:164
+msgid "Create database"
+msgstr "Crear base de datos"
+
+#: ../installer.php:154
msgid "Write configuration"
msgstr "Escribir configuración"
+#: ../installer.php:155
+#: ../installer.php:166
+msgid "Pretty urls"
+msgstr "Url elegantes (pretty)"
-#: ../installer.php:163
+#: ../installer.php:161
msgid "Pre-installation check"
-msgstr "Chequeo previo a la instalación"
+msgstr "Cheque previo de la instalación"
-#: ../installer.php:164
+#: ../installer.php:162
msgid "Requirements & language"
msgstr "Requisitos y lenguaje"
-#: ../installer.php:126
#: ../installer.php:165
-msgid "Settings"
-msgstr "Configuraciones"
-
-#: ../installer.php:166
-msgid "Create database"
-msgstr "Crear base de datos"
-
-#: ../installer.php:167
msgid "Config file"
msgstr "Fichero de configuración"
-#: ../installer.php:168
-msgid "Pretty urls"
-msgstr "url elegantes (pretty)"
+#: ../installer.php:212
+msgid "Please, fill all required fields"
+msgstr "Por favor, rellena los campos obligatorios"
-#: ../installer.php:193
+#: ../installer.php:214
+#: ../library.php:322
msgid "Error: no connection"
msgstr "Error: no hay conexión"
-#: ../installer.php:195
-msgid "Error: no database selected"
-msgstr "Error: no hay seleccionada una base de datos"
-
-
-#: ../installer.php:204
-msgid "There is a existing configuration file"
-msgstr "Existe un fichero de configuración"
-
-msgid "Please remove file to continue installation"
-msgstr "Por favor, borre el fichero para continuar con la instalación"
-
-#: ../installer.php:250
-msgid "Go to"
-msgstr "Ir a"
-#: ../installer.php:254
-msgid "Have a nice day"
-msgstr "Que tenga un buen día"
-
-#: ../installer.php:261
-msgid "Your new Aiki installation"
-msgstr "Tu nueva instalación de Aiki"
-
-#: ../installer.php:320 ../installer.php:321
-msgid "step"
-msgstr "paso"
-
-#: ../installer.php:357
-msgid "Please, fill all required fields"
-msgstr "Por favor, rellena todos los campos obligatorios"
-
-#: ../installer.php:362
+#: ../installer.php:217
msgid "Connection OK"
msgstr "Conexión OK"
-#: ../installer.php:362
+#: ../installer.php:217
msgid "no database name"
-msgstr "no hay base de datos"
+msgstr "falta nombre de la base de datos"
-#: ../installer.php:363
+#: ../installer.php:218
msgid "Error: can't select database"
msgstr "Error: no se puede seleccionar la base de datos"
-#: ../installer.php:366
+#: ../installer.php:221
msgid "Connection and database OK"
-msgstr "Conexión y base de datos OK"
+msgstr "Conexión y base de datos Ok"
-#: ../installer.php:369
+#: ../installer.php:224
msgid "created tables"
-msgstr "tablas creadas"
-
-
-#: ../installer.php:383
+msgstr "Tablas creadas"
+
+#: ../installer.php:241
msgid "error"
msgstr "error"
-msgid "Admin login"
-msgstr "Login de adminstración"
-
-
-#: ../installer.php:394
+#: ../installer.php:251
+msgid "Admin login:"
+msgstr "Login del administrador"
+
+#: ../installer.php:251
+msgid "Password:"
+msgstr "Contraseña"
+
+#: ../installer.php:252
msgid "<strong>Please, annotate</strong> login and password. You will need them"
-msgstr "<strong>Por favor anote</strong> login y contraseña. Los necesitarás"
-
-#: ../installer.php:402
+msgstr "<strong>Por favor, anota</strong> login y contraseña. Te harán falta"
+
+#: ../installer.php:255
+#, php-format
+msgid "Data had send to %s"
+msgstr "Datos han sido enviados a %s"
+
+#: ../installer.php:260
msgid "Some errors during creating tables <em>,perhaps tables already exists</em>"
-msgstr "Ocurrierón errores al crear las tablas <em>, quizás ya existián</em>"
-
-
-
-#: ../installer.php:407
+msgstr "Hubo errores durante la creación de tablas,<em> quizás ya existían</em>"
+
+#: ../installer.php:264
+#: ../installer.php:299
+#: ../installer.php:334
+msgid "Try again"
+msgstr "Intentar de nuevo"
+
+#: ../installer.php:265
msgid "Delete all tables for new installtion, or push next for upgrading"
-msgstr ""
-
-msgid "All tables was created correctly"
-msgstr "Todas las tabls fuerón creadas correctamente"
-
-#: ../installer.php:422
+msgstr "Borrar todas las tablas para una nueva instalación "
+
+#: ../installer.php:267
+msgid "All tables have created correctly"
+msgstr "Todas las tablas han sido creadas correctamente"
+
+#: ../installer.php:280
msgid "FATAL ERROR: failed to read config template file"
-msgstr "ERROR FATAL: no se puede leer la plantilla de configuración"
-
-
-
-#: ../installer.php:439
-msgid "Config file created"
-msgstr "Fichero de configuración creado"
-
-#: ../installer.php:406
-#: ../installer.php:441
-msgid "Try again"
-msgstr "Intentar de nuevo"
-
-#: ../installer.php:444
-msgid "Please, copy this code, create file and paste"
-msgstr "Por favor, copia este código, crea el fichero, y pegalo"
-
-
-#: ../installer.php:445 ../installer.php:480
+msgstr "ERROR FATAL: no se puede abrir la plantilla para el fichero de configuración"
+
+#: ../installer.php:281
+#: ../installer.php:326
+#: ../installer.php:336
+msgid "Path"
+msgstr "Directorio"
+
+#: ../installer.php:297
+msgid "Config file created."
+msgstr "Fichero de configuración creado."
+
+#: ../installer.php:301
+msgid "can't write config file:"
+msgstr "No se puede escribir el fichero de configuración:"
+
+#: ../installer.php:301
+msgid "Path:"
+msgstr "Directorio:"
+
+#: ../installer.php:302
+#: ../installer.php:337
+msgid "Please, copy this code, create file and paste."
+msgstr "Por favor, copia este código, crea el fichero y pégalo."
+
+#: ../installer.php:303
+#: ../installer.php:338
msgid "Check permission in directory"
-msgstr "Comprueba permisos de directorio"
-
-
-#: ../installer.php:455
-msgid "Installation finished <em>pretty urls are enabled with "
-"previous .htaccess</em>"
-msgstr ""
-
-#: ../installer.php:458
-msgid "Try/Check again"
-msgstr "Intenta/Comprueba de nuevo"
-
-#: ../installer.php:459
-msgid "There is a existing .htaccess file"
-msgstr "Existe un fichero .htaccess"
-
-#: ../installer.php:459
-msgid "Please, remove file or rewrite file with this code"
-msgstr "Por favor, borre el fichero o re-escribalo con este código"
-
-#: ../installer.php:467
-msgid "FATAL ERROR: failed to read htaccess.inc file"
-msgstr "ERROR FALTA: no se puede leer htaccess.inc"
-
-#: ../installer.php:473
-msgid "Installation finished <em>pretty urls are enabled</em>"
-msgstr "Instalación finalizado.<em>Url elegantes activas</em>"
-
+msgstr "Comprueba permisos en el directorio"
+
+#: ../installer.php:313
msgid "Installation finished <em>pretty urls are enabled with previous .htaccess</em>"
-msgstr "Instalación finalizada <em>url elegantes estan activas usando el .htaccess existente</em>"
+msgstr "Instalación finalizada <em>url elegantes activas usando un fichero .htaccess anterior</em>"
+#: ../installer.php:314
+#: ../installer.php:332
msgid "Test my site!!"
msgstr "¡¡Probar mi sitio!!"
-#: ../installer.php:491
-msgid "Step %d of %d"
-msgstr "Paso %d de %d"
-
-#: ../installer.php:491
-msgid "Step %d of %d"
-msgstr "Paso %d de %d"
-
-msgid "can't write config file:"
-msgstr "no se puede escribir fichero de configuración"
-
-msgid "Path"
-msgstr "directorio"
+#: ../installer.php:316
+msgid "Try/Check again"
+msgstr "Intentar / comprobar de nuevo"
+
+#: ../installer.php:317
+msgid "There is a existing .htaccess file."
+msgstr "Existe un fichero .htaccess."
+
+#: ../installer.php:318
+msgid "Please, remove file or rewrite file with this code:"
+msgstr "Por favor, borre el fichero o sobre-escríbalo con este código:"
+
+#: ../installer.php:325
+msgid "FATAL ERROR: failed to read htaccess.inc file"
+msgstr "FATAL ERROR: fallo la lectura del fichero .htaccess.inc"
+
+#: ../installer.php:331
+msgid "Installation finished <em>pretty urls are enabled.</em>"
+msgstr "Instalación finalizada <em>con url elegantes activas.</em>"
+
+#: ../installer.php:336
+msgid "Aiki can't write .htaccess file:"
+msgstr "No se puede escribir el fichero .htaccess-"
+
+#: ../installer.php:350
+msgid "installer.css"
+msgstr ""
+
+#: ../installer.php:351
+msgid "dir='ltr'"
+msgstr ""
+
+#: ../installer.php:355
+#, php-format
+msgid "Step %d of %d"
+msgstr "Paso %d de %d"
+
+#: ../library.php:271
+msgid "Select language for installation"
+msgstr "Seleccione el idioma para la instalación"
+
+#: ../library.php:274
+msgid "Change"
+msgstr "Cambiar"
+
+#: ../library.php:293
+msgid "oracle 8 or higher"
+msgstr "oracle 8 o superior"
+
+#: ../library.php:325
+msgid "Error: no database selected"
+msgstr "Error: no hay base de datos seleccionada"
+
+#: ../library.php:335
+msgid "There is a existing configuration file."
+msgstr "Existe un fichero de configuración."
+
+#: ../library.php:336
+msgid "Please remove file to continue installation"
+msgstr "Por favor, borre este fichero para continuar la instalación"
+
+#: ../library.php:357
+msgid "Essential files missing"
+msgstr "No se encuentras ficheros imprescindibles"
+
+#: ../library.php:391
+msgid "Hello"
+msgstr "Hola"
+
+#: ../library.php:392
+msgid "Your new Aiki installation is ready to be used"
+msgstr "Tu nueva instalación de Aiki ya esta lista"
+
+#: ../library.php:393
+msgid "Go to"
+msgstr "Ir a"
+
+#: ../library.php:394
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#: ../library.php:396
+msgid "Have a nice day"
+msgstr "Que tengas un buen día"
+
+#: ../library.php:398
+msgid "Your new Aiki installation"
+msgstr "Tu nueva instalación de Aiki"
+
+#: ../defaults.php:16
+msgid "Aiki Framework Installer"
+msgstr "Instalador Aiki Framework"
+
+#: ../defaults.php:19
+msgid "Aiki Installer"
+msgstr "Instalador Aiki"
+
+#: ../defaults.php:24
+msgid "<strong>Aiki Framework</strong> is an open source high-performance Web Application Framework for rapid web application development using Open Standards."
+msgstr "<strong>Aiki Framework</strong> es un framework de código abierto, de alto rendimiento para desarrollo de aplicaciones web usando estándares abiertos."
+
+#: ../defaults.php:29
+msgid "Requirements"
+msgstr "Requisitos"
+
+#: ../defaults.php:30
+msgid "Before we start you need the following:"
+msgstr "Antes de empezar, necesitas:"
+
+#: ../defaults.php:32
+msgid "An empty database, with collation set to"
+msgstr "Una base de datos vacía con cotejo (collation set) de "
+
+#: ../defaults.php:33
+msgid "PHP 5.2 or above and Apache2"
+msgstr "PHP 5.2 o superior y Apache2"
+
+#: ../defaults.php:34
+msgid "mod_rewrite must be enabled inside apache2 httpd.conf"
+msgstr "mod_rewrite activo "
+
=== modified file 'assets/apps/installer/library.php'
--- assets/apps/installer/library.php 2012-01-19 23:04:29 +0000
+++ assets/apps/installer/library.php 2012-01-22 22:03:33 +0000
@@ -18,13 +18,21 @@
*
*
* Installer function library
- * @todo PHPDOC
- */
-
-
-define ("SQLS_DELIMITER", "-- ------------------------------------------------------");
-
-function iso639($code) {
+ *
+ */
+
+
+/**
+ *
+ * return english name of iso6391 codec
+ *
+ * @param string iso code
+ *
+ * @return english name or code.
+ */
+
+function iso639($code) {
+ // source: http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
$iso639 = array(
'aa' => 'Afar',
'ab' => 'Abkhaz',
@@ -137,7 +145,7 @@
'mt' => 'Maltese',
'my' => 'Burmese',
'na' => 'Nauru',
- 'nb' => 'Norwegian Bokmål',
+ 'nb' => 'Norwegian Bokmål',
'nd' => 'North Ndebele',
'ne' => 'Nepali',
'ng' => 'Ndonga',
@@ -163,7 +171,7 @@
'ro' => 'Romanian, Moldavian, Moldovan',
'ru' => 'Russian',
'rw' => 'Kinyarwanda',
- 'sa' => 'Sanskrit (Sa?sk?ta)',
+ 'sa' => 'Sanskrit (Saṁskṛta)',
'sc' => 'Sardinian',
'sd' => 'Sindhi',
'se' => 'Northern Sami',
@@ -201,7 +209,7 @@
'uz' => 'Uzbek',
've' => 'Venda',
'vi' => 'Vietnamese',
- 'vo' => 'Volapük',
+ 'vo' => 'Volapük',
'wa' => 'Walloon',
'wo' => 'Wolof',
'xh' => 'Xhosa',
@@ -215,6 +223,17 @@
}
+/**
+ *
+ * construct html form inserting config values, buttons, and next step.
+ *
+ * @param $step next step
+ * @param $buttons string with additional html controls.
+ *
+ * @return string containg complete form
+ */
+
+
function form_hidden ( $step , $buttons) {
global $config;
@@ -226,13 +245,52 @@
return $form_hidden;
}
-// html templates for controls.
+
+/**
+ *
+ * construct select control for language select
+ *
+ * @param array translations available
+ *
+ * @return string containg comple html select or "" if not necesary
+ */
+
+function select_language (){
+ global $t;
+
+ $translations = $t->translations();
+ if ( !is_array($translations) || count($translations)==0 ){
+ return "";
+ }
+
+ $options = "<option value='en'>English</option>";
+ foreach ( $translations as $isoCode ){
+ $options .= "<option value='$isoCode'>" . iso639($isoCode) ."</option>\n";
+ }
+ return
+ "<form id='f_language'><label for='language'>" . $t->t("Select language for installation") ."</label>\n" .
+ "<select name='language' id='language' class='user-input'>".
+ $options.
+ "</select><input type='submit' value='" . $t->t("Change") ."'></form>";
+}
+
+
+/**
+ *
+ * construct select control for sql server type
+ *
+ * @param actual selected $db_type
+ *
+ * @return string containg comple html select.
+ */
+
function select_db_type( $db_type ){
+ global $t;
$selectType="<select name='db_type' id='db_type' class='user-input'>\n";
$options = array (
"mysql" =>"MySQL",
"mssql" =>"mssql",
- "oracle" =>"oracle 8 or higher",
+ "oracle" => $t->t("oracle 8 or higher"),
"pdo"=>"PDO",
"postgresql" =>"postgresql",
"sqlite" =>"sqlite");
@@ -244,17 +302,27 @@
return $selectType;
}
+/**
+ *
+ * check step
+ *
+ * @param by value step.
+ *
+ * @return message or "". Correct step.
+ */
function check_step(&$step) {
- global $AIKI_ROOT_DIR, $config;
+ global $AIKI_ROOT_DIR, $config, $t;
switch ($step){
case 4:
case 5:
if ( !@mysql_connect ($config['db_host'], $config['db_user'], $config['db_pass']) ) {
- return "_t(Error: no connection)" ;
+ $step=2;
+ return $t->t("Error: no connection") ;
} elseif ( !@mysql_selectdb ($config['db_name']) ){
- return "_t(Error: no database selected)";
+ $step=2;
+ return $t->t("Error: no database selected");
}
if ( $step==5 && !file_exists($AIKI_ROOT_DIR ."/config.php") ){
$step=4;
@@ -263,7 +331,9 @@
case 2:
default:
if ( file_exists($AIKI_ROOT_DIR ."/config.php" ) && $step!=5 ) {
- return "_t(There is a existing configuration file)<em>_t(Please remove file to continue installation)<br>".
+ $step=0;
+ return $t->t("There is a existing configuration file.") .
+ "<em>". $t->t("Please remove file to continue installation") ."<br>".
"$AIKI_ROOT_DIR/config.php".
"</em>";
}
@@ -283,7 +353,8 @@
}
}
if ($message!="") {
- $message ="_t(Essential files missing):<em>$message</em>";
+ $step=0;
+ $message = $t->t("Essential files missing") . ":<em>$message</em>";
}
return $message;
}
@@ -296,6 +367,15 @@
}
+/**
+ *
+ * send login and password via email
+ *
+ * @global $config, $AIKI_SITE_URL, $t
+ *
+ * @return false if mail is send else true
+ */
+
function send_data_by_email(){
global $config, $AIKI_SITE_URL, $t;
@@ -305,50 +385,53 @@
}
$headers = "MIME-Version: 1.0\r\n";
- $headers .= "Content-type: text/html; charset=utf-8\r\n";
+ $headers .= "Content-type: text/plain; charset=utf-8\r\n";
$headers .= "From: [email protected]\r\n";
- $message = "_t(Hello) {$config['ADMIN_FULLNAME']} _t(your new Aiki installation is ready to be used) <br>\n".
- "_t(Go to): " . $AIKI_SITE_URL . "admin <br>\n".
- "_t(Username): {$config['ADMIN_USER']} <br>\n".
- "_t(Password): {$config['ADMIN_PASSWORD']}<br>\n".
- " <br>\n".
- "_t(Have a nice day)<br>\n";
+ $message = $t->t("Hello"). " {$config['ADMIN_FULLNAME']} \n".
+ $t->t("Your new Aiki installation is ready to be used"). "\n\n".
+ $t->t("Go to") . ": $AIKI_SITE_URL/admin \n".
+ $t->t("Username") . ":{$config['ADMIN_USER']} \n".
+ $t->t("Password") . ":{$config['ADMIN_PASSWORD']}\n\n".
+ $t->t("Have a nice day")."<br>\n";
- // translate.
- $message = preg_replace_callback (
- "/_t\(([^\)]*)\)/", // all _t(literals)
- array($t,"t"), // will be translated by $t->t()
- $message );
- mail($config['ADMIN_EMAIL'], $t->t('Your new Aiki installation'),$message,$headers);
-
- return true;
-
+ return mail($config['ADMIN_EMAIL'], $t->t('Your new Aiki installation'),$message,$headers);
+
}
/**
*
* Get new htaccess file from template /configs/htaccess.inc
*
- * @param string aiki root dir
+ * @param string aiki installation path
*
- * @return false or string htaccess content.
+ * @return false or htaccess content as string.
*/
-function get_new_htaccess($url){
- $htaccess_file = file_get_contents("$url/configs/htaccess.inc");
+function get_new_htaccess($aikiPath){
+ $htaccess_file = @file_get_contents("$aikiPath/configs/htaccess.inc");
if ( $htaccess_file == false ){
return false;
}
- $replace= array ( "@AIKI_REWRITE_BASE@" => clean_url($_SERVER["REQUEST_URI"]) );
- $htaccess_file = strtr( $htaccess_file, $replace);
- return $htaccess_file;
+ return str_replace( "@AIKI_REWRITE_BASE@", clean_url($_SERVER["REQUEST_URI"]), $htaccess_file);
+
}
+/**
+ *
+ * Read all sql file, making some replacemnets
+ *
+ * @global $config, $AIKI_ROOT_DIR, $AIKI_SITE_URL, $AIKI_AUTHORS
+ *
+ * @return array of SQLS statments
+ */
+
function sqls(){
global $config, $AIKI_ROOT_DIR, $AIKI_SITE_URL, $AIKI_AUTHORS ;
+ $SQLS_DELIMITER = "-- ------------------------------------------------------";
+
$config["ADMIN_PASSWORD"] = substr(md5(uniqid(rand(),true)),1,8);
$config["ADMIN_PASSWORD_MD5_MD5"]= md5(md5($config["ADMIN_PASSWORD"]));
@@ -369,14 +452,14 @@
"$AIKI_ROOT_DIR/sql/CreateTables.sql",
"$AIKI_ROOT_DIR/sql/InsertDefaults.sql",
"$AIKI_ROOT_DIR/sql/InsertVariable-in.sql",
- "$AIKI_ROOT_DIR/sql/Site.sql");
+ "Site.sql");
foreach ($files as $file ){
if ( file_exists($file) ){
- $ret.= SQLS_DELIMITER . "\n". @file_get_contents($file) ;
+ $ret.= $SQLS_DELIMITER . "\n". @file_get_contents($file) ;
}
}
- return explode(SQLS_DELIMITER, strtr ($ret, $replace));
+ return explode($SQLS_DELIMITER, strtr ($ret, $replace));
// note: files can contain sql_delimeters,
}
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
