Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

(Add a new readme in markdown format + translation #53

Merged
merged 5 commits into from

2 participants

@iam-merlin

Hi,
it's cybervirax (just for info, same guy ^^)... I converted readme.txt into a markdown one and translated a little more sentences and words ^^.

@Datawalke
Owner

@iam-merlin Thank you!

@Datawalke Datawalke merged commit a63c935 into from
@iam-merlin
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Aug 14, 2012
  1. @iam-merlin

    Add md readme

    iam-merlin authored
  2. @iam-merlin

    Update Readme.md

    iam-merlin authored
  3. @iam-merlin

    Add more traduction

    iam-merlin authored
  4. @iam-merlin

    Update Readme.md

    iam-merlin authored
    Change cybervirax by iam-merlin (same one ^^)
  5. @iam-merlin

    Minor update

    iam-merlin authored
This page is out of date. Refresh to see the latest.
View
124 Readme.md
@@ -0,0 +1,124 @@
+Requirements
+==================================
+All that is required is your basic LAMP/WAMP stack.
+However the best-case conditions:
+* PHP5+
+* MySQL 5.1+
+
+
+How to Install Coordino
+==================================
+Unzip the Coordino package your root working www directory.
+
+ ex: /var/www/htdocs/test.com
+
+Then open your web browser and proceed to <http://test.com> to complete instillation.
+
+
+Widget Tokens
+==================================
+Tokens may be used to render dynamic content to the user.
+
+The following tokens are available:
+* The logged in user's username. - [user.username]
+* The logged in user's reputation. - [user.reputation]
+* The logged in user's age. - [user.age]
+* The logged in user's website. - [user.website]
+* The logged in user's information. - [user.info]
+* The logged in user's location. - [user.location]
+* The logged in user's answer count. - [user.answer-count]
+* The logged in user's comment count. - [user.comment-count]
+* The logged in user's question count. - [user.question-count]
+* A link to the user's profile. - [user.profile-link]
+
+For example:
+
+ Hello [user.username], Welcome to Coordino!
+ Check out your profile at: [user.profile-link]
+ Or answer some questions!
+
+
+Remote Auth. Logins
+==================================
+Coordino works in two modes:
+
+1. An internal userbase. (Remote Auth Only "No")
+2. Remote userbase. (Remote Auth Only "Yes")
+
+These settings may be changed in the administration setting under "Admin" -> "Remote Settings"
+
+The internal userbase is the standard setting for Coordino. New users will register either by asking a question,
+answering a question or registering themselves. The users username, password, and email are kept internally.
+
+However, if you have an external userbase already and do not wish to have all of your users re-register for a system you can use a form of automatic integration. You must create a script that first compiles a message and then forwards it to Coordino's Remote Login system based off of your current logged in user's details.
+
+The following user details from your userbase are needed:
+
+- Username
+- Email Address
+
+The following extra message details are needed:
+
+- Timestamp
+- Remote Auth Key (Found in Remote Settings)
+- Hash
+
+Take the following example in PHP:
+
+```Php
+/*
+ * Remote authentication for PHP
+ * This is meant to be used as a template to base the integration with your application.
+ */
+
+// The following values should comefrom your source of information
+$username = 'BillyRogan';
+$email = 'rbillyscool@aol.com';
+
+// Insert your Authentication key here
+$key = '98y94NIUfafnajskfn9823JNAIUz';
+
+// Build the Message
+$timestamp = time();
+$message = $username . $email . $timestamp . $key;
+$hash= md5($message);
+
+// Set the URL of your Answer Engine install and form the correct remote authentication URL.
+$url = 'http://your.domain.com/coordino_install/access/remote' . $name . '/' . $email . '/' . $timestamp . '/' . $hash;
+header('Location: ' . $url);
+```
+
+The username and email address are pulled from your current userbase.
+Then a message is compiled with the User's username, email, a timestamp, and your remote auth key. That message is then md5'd into a check hash. A URL is then formed with the correct information and the remote logged in user is then forwarded to the Coordino Remote Access URL.
+
+
+Translate Coordino
+==================================
+Because Coordino is ready for i18n, you can contribute to tranlate it!
+To help you, you can have some informations in :
+<http://book.cakephp.org/1.3/en/view/1229/Internationalizing-Your-Application>
+
+How to generate .pot files ?
+----------------------------
+Run this command in the root path of Coordino :
+
+ $ php cake/console/cake.php i18n
+ > [E]xtract POT file from sources
+ > Verify the full path in [] for "app" and validate it
+ > [D] Done
+ > Verify the full path in [] for "app/locale" and enter to validate it
+ > Merge all domains strings in the default.pot file (y)
+ > Waiting for extractig
+ > Default.pot already exists, Overwrite it! (y)
+ > verb.pot already exists, Overwrite it too! (y)
+ > Done ;)
+
+Contributors - Thank you!
+==================================
+
+* do9iigane
+* [iam-merlin](https://github.com/iam-merlin)
+* ultramundane
+* datawalke
+
+Don't see yourself Just edit the Readme!
View
32 app/controllers/posts_controller.php
@@ -37,16 +37,16 @@ public function afterFilter() {
public function delete($id) {
if(!$this->isAdmin($this->Auth->user('id'))) {
- $this->Session->setFlash('You do not have permission to access that..', 'error');
+ $this->Session->setFlash(__('You do not have permission to access that..',true), 'error');
$this->redirect('/');
}
$this->Post->delete($id);
- $this->Session->setFlash('Post Deleted', 'error');
+ $this->Session->setFlash(__('Post deleted',true), 'error');
$this->redirect('/');
}
public function ask() {
- $this->set('title_for_layout', 'Ask a question!');
+ $this->set('title_for_layout', __('Ask a question',true));
if(!empty($this->data)) {
@@ -123,7 +123,7 @@ public function answer($public_key) {
$this->set('answer', $this->data['Post']['content']);
$this->Email->from = 'Answerman <answers@' . $_SERVER['SERVER_NAME'] . '>';
$this->Email->to = $user['User']['email'];
- $this->Email->subject = 'Your question has been answered!';
+ $this->Email->subject = __('Your question has been answered!',true);
$this->Email->template = 'notification';
$this->Email->sendAs = 'both';
$this->Email->send();
@@ -154,7 +154,7 @@ public function __validatePost($data, $redirectUrl, $reCaptcha = false) {
if($reCaptcha == true) {
if(!$this->Recaptcha->valid($data['reCAPTCHA'])) {
$data['Post']['content'] = $this->Markdownify->parseString($data['Post']['content']);
- $recaptchaErrors = array('recaptcha' => 'Invalid reCAPTCHA entered.');
+ $recaptchaErrors = array('recaptcha' => __('Invalid reCAPTCHA entered.',true));
$errors = array(
'errors' => $recaptchaErrors,
'data' => $data
@@ -404,7 +404,7 @@ public function view($public_key) {
* If so redirect.
*/
if($question['Post']['flags'] >= $flag_check['Setting']['value'] && $this->Setting->repCheck($this->Auth->user('id'), 'rep_edit')) {
- $this->Session->setFlash('The question you are trying to view no longer exists.', 'error');
+ $this->Session->setFlash(__('The question you are trying to view no longer exists.',true), 'error');
$this->redirect('/');
}
@@ -444,7 +444,7 @@ public function edit($public_key) {
$redirect = $this->Post->findById($redirect['Post']['related_id']);
}
if($question['Post']['user_id'] != $this->Auth->user('id') && !$this->isAdmin($this->Auth->user('id')) && !$this->Setting->repCheck($this->Auth->user('id'), 'rep_edit')) {
- $this->Session->setFlash('That is not your question to edit, and you need more reputation!', 'error');
+ $this->Session->setFlash(__('That is not your question to edit, and you need more reputation!',true), 'error');
$this->redirect('/questions/' . $redirect['Post']['public_key'] . '/' . $redirect['Post']['url_title']);
}
if(!empty($question['Post']['title'])) {
@@ -539,15 +539,15 @@ public function display($type='recent', $page=1) {
$keywords = array('hot', 'week', 'month', 'recent', 'solved', 'unanswered');
if(($search == 'no') && (!in_array($type, $keywords))) {
- $this->Session->setFlash('Invalid search type.', 'error');
+ $this->Session->setFlash(__('Invalid search type.',true), 'error');
$this->redirect('/');
}
if(empty($questions)) {
if(isset($type['needle'])) {
- $this->Session->setFlash('No results for "' . $type['needle'] . '"!', 'error');
+ $this->Session->setFlash(__('No results for',true) . ' "' . $type['needle'] . '"!', 'error');
}else {
- $this->Session->setFlash('No results for "' . $type . '"!', 'error');
+ $this->Session->setFlash(__('No results for',true) . ' "' . $type . '"!', 'error');
}
if($this->Post->find('count') > 0) {
$this->redirect('/');
@@ -579,7 +579,7 @@ public function markCorrect($public_key) {
* Check to make sure the Post is an answer
*/
if($answer['Post']['type'] != 'answer') {
- $this->Session->setFlash('What are you trying to do?', 'error');
+ $this->Session->setFlash(__('What are you trying to do?',true), 'error');
$this->redirect('/');
}
@@ -588,7 +588,7 @@ public function markCorrect($public_key) {
* Check to make sure the logged in user is authorized to edit this Post
*/
if($question['Post']['user_id'] != $this->Auth->user('id')) {
- $this->Session->setFlash('You are not allowed to edit that.');
+ $this->Session->setFlash(__('You are not allowed to edit that.',true));
$this->redirect('/questions/' . $question['Post']['public_key'] . '/' . $question['Post']['url_title']);
}
@@ -628,18 +628,18 @@ public function markCorrect($public_key) {
public function flag($public_key) {
$redirect = $this->Post->correctRedirect($public_key);
if(!$this->Auth->user('id')) {
- $this->Session->setFlash('You need to be logged in to do that!', 'error');
+ $this->Session->setFlash(__('You need to be logged in to do that!',true), 'error');
$this->redirect('/questions/' . $redirect['Post']['public_key'] . '/' . $redirect['Post']['url_title']);
}elseif(!$this->Setting->repCheck($this->Auth->user('id'), 'rep_flag')) {
- $this->Session->setFlash('You need more reputation to do that.', 'error');
+ $this->Session->setFlash(__('You need more reputation to do that.',true), 'error');
$this->redirect('/questions/' . $redirect['Post']['public_key'] . '/' . $redirect['Post']['url_title']);
}else{
$flag = $this->Vote->throwFlag($this->Auth->user('id'), $public_key);
if($flag == 'exists') {
- $this->Session->setFlash('You have already flagged that.', 'error');
+ $this->Session->setFlash(__('You have already flagged that.',true), 'error');
$this->redirect('/questions/' . $redirect['Post']['public_key'] . '/' . $redirect['Post']['url_title']);
}elseif($flag == 'success') {
- $this->Session->setFlash('Post flagged.', 'error');
+ $this->Session->setFlash(__('Post flagged.',true), 'error');
$this->redirect('/questions/' . $redirect['Post']['public_key'] . '/' . $redirect['Post']['url_title']);
}
}
View
156 app/locale/default.pot
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2012-05-09 05:47+0200\n"
+"POT-Creation-Date: 2012-08-14 12:01+0200\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@@ -14,6 +14,68 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+#: /controllers/posts_controller.php:40
+msgid "You do not have permission to access that.."
+msgstr ""
+
+#: /controllers/posts_controller.php:44
+msgid "Post deleted"
+msgstr ""
+
+#: /controllers/posts_controller.php:49
+#: /views/layouts/default.ctp:162
+#: /views/posts/ask.ctp:68;116
+msgid "Ask a question"
+msgstr ""
+
+#: /controllers/posts_controller.php:126
+msgid "Your question has been answered!"
+msgstr ""
+
+#: /controllers/posts_controller.php:157
+msgid "Invalid reCAPTCHA entered."
+msgstr ""
+
+#: /controllers/posts_controller.php:407
+msgid "The question you are trying to view no longer exists."
+msgstr ""
+
+#: /controllers/posts_controller.php:447
+msgid "That is not your question to edit, and you need more reputation!"
+msgstr ""
+
+#: /controllers/posts_controller.php:542
+msgid "Invalid search type."
+msgstr ""
+
+#: /controllers/posts_controller.php:548;550
+msgid "No results for"
+msgstr ""
+
+#: /controllers/posts_controller.php:582
+msgid "What are you trying to do?"
+msgstr ""
+
+#: /controllers/posts_controller.php:591
+msgid "You are not allowed to edit that."
+msgstr ""
+
+#: /controllers/posts_controller.php:631
+msgid "You need to be logged in to do that!"
+msgstr ""
+
+#: /controllers/posts_controller.php:634
+msgid "You need more reputation to do that."
+msgstr ""
+
+#: /controllers/posts_controller.php:639
+msgid "You have already flagged that."
+msgstr ""
+
+#: /controllers/posts_controller.php:642
+msgid "Post flagged."
+msgstr ""
+
#: /views/layouts/default.ctp:49
msgid "login"
msgstr ""
@@ -22,88 +84,136 @@ msgstr ""
msgid "register"
msgstr ""
-#: /views/layouts/default.ctp:66;213
+#: /views/layouts/default.ctp:66;217
msgid "about"
msgstr ""
-#: /views/layouts/default.ctp:74;97
+#: /views/layouts/default.ctp:74;98
msgid "settings"
msgstr ""
#: /views/layouts/default.ctp:81
+#: /views/layouts/install.ctp:14
msgid "change language"
msgstr ""
#: /views/layouts/default.ctp:83
+#: /views/layouts/install.ctp:16
msgid "english"
msgstr ""
#: /views/layouts/default.ctp:84
+#: /views/layouts/install.ctp:17
msgid "french"
msgstr ""
-#: /views/layouts/default.ctp:90
+#: /views/layouts/default.ctp:85
+msgid "chinese"
+msgstr ""
+
+#: /views/layouts/default.ctp:91
msgid "admin"
msgstr ""
-#: /views/layouts/default.ctp:104
+#: /views/layouts/default.ctp:105
msgid "Flagged Posts"
msgstr ""
-#: /views/layouts/default.ctp:111
+#: /views/layouts/default.ctp:112
msgid "User Management"
msgstr ""
-#: /views/layouts/default.ctp:118
+#: /views/layouts/default.ctp:119
msgid "Blacklist"
msgstr ""
-#: /views/layouts/default.ctp:125
+#: /views/layouts/default.ctp:126
msgid "Remote Settings"
msgstr ""
-#: /views/layouts/default.ctp:137
+#: /views/layouts/default.ctp:138
msgid "logout"
msgstr ""
-#: /views/layouts/default.ctp:152
+#: /views/layouts/default.ctp:153
msgid "Questions"
msgstr ""
-#: /views/layouts/default.ctp:154
+#: /views/layouts/default.ctp:155
+#: /views/posts/ask.ctp:90
msgid "Tags"
msgstr ""
-#: /views/layouts/default.ctp:155
+#: /views/layouts/default.ctp:156
msgid "Unsolved"
msgstr ""
-#: /views/layouts/default.ctp:156
+#: /views/layouts/default.ctp:157
msgid "Users"
msgstr ""
-#: /views/layouts/default.ctp:161;211
-msgid "ask a question"
-msgstr ""
-
-#: /views/layouts/default.ctp:188
+#: /views/layouts/default.ctp:189
#: /views/posts/view.ctp:55;237
msgid "edit"
msgstr ""
-#: /views/layouts/default.ctp:189
+#: /views/layouts/default.ctp:190
#: /views/posts/view.ctp:62
msgid "del"
msgstr ""
-#: /views/layouts/default.ctp:199
+#: /views/layouts/default.ctp:200
msgid "add widgets to this page"
msgstr ""
-#: /views/layouts/default.ctp:210
+#: /views/layouts/default.ctp:212
msgid "home"
msgstr ""
+#: /views/layouts/default.ctp:214
+msgid "ask a question"
+msgstr ""
+
+#: /views/posts/ask.ctp:60
+msgid "Titles must be at least 10 characters long."
+msgstr ""
+
+#: /views/posts/ask.ctp:62;79
+msgid "What is your question about?"
+msgstr ""
+
+#: /views/posts/ask.ctp:76
+msgid "Title"
+msgstr ""
+
+#: /views/posts/ask.ctp:92
+msgid "Combine multiple words into single-words."
+msgstr ""
+
+#: /views/posts/ask.ctp:95
+msgid "Who Are You?"
+msgstr ""
+
+#: /views/posts/ask.ctp:96
+msgid "Have an account already?"
+msgstr ""
+
+#: /views/posts/ask.ctp:96
+msgid "Login before answering!"
+msgstr ""
+
+#: /views/posts/ask.ctp:97
+msgid "Name"
+msgstr ""
+
+#: /views/posts/ask.ctp:103
+msgid "Email"
+msgstr ""
+
+#: /views/posts/ask.ctp:112
+msgid "Notify me when my question is answered."
+msgstr ""
+
#: /views/posts/display.ctp:8
#: /views/posts/view.ctp:154
msgid "answer"
@@ -141,3 +251,7 @@ msgstr ""
msgid "Debug setting does not allow access to this url."
msgstr ""
+#: /views/posts/view.ctp:312
+msgid "Answer"
+msgstr ""
+
View
BIN  app/locale/fre/LC_MESSAGES/default.mo
Binary file not shown
View
168 app/locale/fre/LC_MESSAGES/default.po
@@ -4,10 +4,11 @@
msgid ""
msgstr ""
"Project-Id-Version: Coordino\n"
-"POT-Creation-Date: 2012-05-09 05:47+0200\n"
-"PO-Revision-Date: 2012-05-09 05:48+0100\n"
+"POT-Creation-Date: 2012-08-14 12:01+0200\n"
+"PO-Revision-Date: 2012-08-14 12:13+0100\n"
"Last-Translator: Romain DARY <romain.dary@eoko.fr>\n"
"Language-Team: Eoko <romain.dary@eoko.fr>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -16,6 +17,69 @@ msgstr ""
"X-Poedit-Country: FRANCE\n"
"X-Poedit-SourceCharset: utf-8\n"
+#: /controllers/posts_controller.php:40
+msgid "You do not have permission to access that.."
+msgstr "Vous n'avez pas la permission pour accéder à ça."
+
+#: /controllers/posts_controller.php:44
+msgid "Post deleted"
+msgstr "Message supprimé"
+
+#: /controllers/posts_controller.php:49
+#: /views/layouts/default.ctp:162
+#: /views/posts/ask.ctp:68;116
+msgid "Ask a question"
+msgstr "Poser une question"
+
+#: /controllers/posts_controller.php:126
+msgid "Your question has been answered!"
+msgstr "Votre question a eu une réponse!"
+
+#: /controllers/posts_controller.php:157
+msgid "Invalid reCAPTCHA entered."
+msgstr "Le reCAPTCHA renseigné est invalide."
+
+#: /controllers/posts_controller.php:407
+msgid "The question you are trying to view no longer exists."
+msgstr "La question que vous essayez de consulter n'existe plus."
+
+#: /controllers/posts_controller.php:447
+msgid "That is not your question to edit, and you need more reputation!"
+msgstr "Ceci n'est pas votre question, vous ne pouvez pas l'éditer et vous avez besoin de plus de réputation!"
+
+#: /controllers/posts_controller.php:542
+msgid "Invalid search type."
+msgstr "Type de recherche invalide."
+
+#: /controllers/posts_controller.php:548;550
+msgid "No results for"
+msgstr "Aucun résultat pour"
+
+#: /controllers/posts_controller.php:582
+msgid "What are you trying to do?"
+msgstr "Qu'est ce que vous essayez de faire?"
+
+#: /controllers/posts_controller.php:591
+msgid "You are not allowed to edit that."
+msgstr "Vous n'êtes pas autorisé à éditer cela."
+
+#: /controllers/posts_controller.php:631
+msgid "You need to be logged in to do that!"
+msgstr "Vous devez être connecter pour faire cela."
+
+#: /controllers/posts_controller.php:634
+msgid "You need more reputation to do that."
+msgstr "Vous avez besoin de plus de réputation pour faire cela."
+
+#: /controllers/posts_controller.php:639
+#, fuzzy
+msgid "You have already flagged that."
+msgstr "Vous avez déjà \"flagged\" cela."
+
+#: /controllers/posts_controller.php:642
+msgid "Post flagged."
+msgstr "Message supprimé."
+
#: /views/layouts/default.ctp:49
msgid "login"
msgstr "connexion"
@@ -24,88 +88,136 @@ msgstr "connexion"
msgid "register"
msgstr "s'enregistrer"
-#: /views/layouts/default.ctp:66;213
+#: /views/layouts/default.ctp:66;217
msgid "about"
msgstr "à propos"
-#: /views/layouts/default.ctp:74;97
+#: /views/layouts/default.ctp:74;98
msgid "settings"
msgstr "paramètres"
#: /views/layouts/default.ctp:81
+#: /views/layouts/install.ctp:14
msgid "change language"
msgstr "changer de langue"
#: /views/layouts/default.ctp:83
+#: /views/layouts/install.ctp:16
msgid "english"
msgstr "anglais"
#: /views/layouts/default.ctp:84
+#: /views/layouts/install.ctp:17
msgid "french"
msgstr "français"
-#: /views/layouts/default.ctp:90
+#: /views/layouts/default.ctp:85
+msgid "chinese"
+msgstr "chinois"
+
+#: /views/layouts/default.ctp:91
msgid "admin"
msgstr "admin"
-#: /views/layouts/default.ctp:104
+#: /views/layouts/default.ctp:105
msgid "Flagged Posts"
msgstr "Contribution signalé"
-#: /views/layouts/default.ctp:111
+#: /views/layouts/default.ctp:112
msgid "User Management"
msgstr "Gestion des membres"
-#: /views/layouts/default.ctp:118
+#: /views/layouts/default.ctp:119
msgid "Blacklist"
msgstr "Liste noire"
-#: /views/layouts/default.ctp:125
+#: /views/layouts/default.ctp:126
msgid "Remote Settings"
msgstr "Paramètres distants"
-#: /views/layouts/default.ctp:137
+#: /views/layouts/default.ctp:138
msgid "logout"
msgstr "Déconnexion"
-#: /views/layouts/default.ctp:152
+#: /views/layouts/default.ctp:153
msgid "Questions"
msgstr "Questions"
-#: /views/layouts/default.ctp:154
+#: /views/layouts/default.ctp:155
+#: /views/posts/ask.ctp:90
msgid "Tags"
msgstr "Mot-clés"
-#: /views/layouts/default.ctp:155
+#: /views/layouts/default.ctp:156
msgid "Unsolved"
msgstr "Non-résolue"
-#: /views/layouts/default.ctp:156
+#: /views/layouts/default.ctp:157
msgid "Users"
msgstr "Utilisateur"
-#: /views/layouts/default.ctp:161;211
-msgid "ask a question"
-msgstr "poser une question"
-
-#: /views/layouts/default.ctp:188
+#: /views/layouts/default.ctp:189
#: /views/posts/view.ctp:55;237
msgid "edit"
msgstr "édit"
-#: /views/layouts/default.ctp:189
+#: /views/layouts/default.ctp:190
#: /views/posts/view.ctp:62
msgid "del"
msgstr "suppr"
-#: /views/layouts/default.ctp:199
+#: /views/layouts/default.ctp:200
msgid "add widgets to this page"
msgstr "ajouter des widgets à cette page"
-#: /views/layouts/default.ctp:210
+#: /views/layouts/default.ctp:212
msgid "home"
msgstr "accueil"
+#: /views/layouts/default.ctp:214
+msgid "ask a question"
+msgstr "poser une question"
+
+#: /views/posts/ask.ctp:60
+msgid "Titles must be at least 10 characters long."
+msgstr "Le titre doit contenir un minimum de 10 caractères."
+
+#: /views/posts/ask.ctp:62;79
+msgid "What is your question about?"
+msgstr "Qu'elle est votre question?"
+
+#: /views/posts/ask.ctp:76
+msgid "Title"
+msgstr "Titre"
+
+#: /views/posts/ask.ctp:92
+msgid "Combine multiple words into single-words."
+msgstr "Combinez plusieurs mots en un mot unique"
+
+#: /views/posts/ask.ctp:95
+msgid "Who Are You?"
+msgstr "Qui êtes-vous?"
+
+#: /views/posts/ask.ctp:96
+msgid "Have an account already?"
+msgstr "Avez-vous déjà un compte?"
+
+#: /views/posts/ask.ctp:96
+msgid "Login before answering!"
+msgstr "Veuillez vous identifier avant de poser une question!"
+
+#: /views/posts/ask.ctp:97
+msgid "Name"
+msgstr "Nom"
+
+#: /views/posts/ask.ctp:103
+msgid "Email"
+msgstr "Email"
+
+#: /views/posts/ask.ctp:112
+msgid "Notify me when my question is answered."
+msgstr "Avertissez moi quand ma question aura une réponse."
+
#: /views/posts/display.ctp:8
#: /views/posts/view.ctp:154
msgid "answer"
@@ -128,9 +240,8 @@ msgid "add comment"
msgstr "ajouter un commentaire"
#: /views/posts/view.ctp:288
-#, fuzzy
msgid "your answer"
-msgstr "réponse"
+msgstr "votre question"
#: /views/users/login.ctp:2
msgid "You are currently an anonymous user. Login below to sign into your account"
@@ -142,7 +253,12 @@ msgstr "Image de profile"
#: /webroot/test.php:99
msgid "Debug setting does not allow access to this url."
-msgstr ""
+msgstr "Les paramètres de debug ne permettent pas d'accéder à cette url."
-#~ msgid "ask a Question"
+#: /views/posts/view.ctp:312
+msgid "Answer"
+msgstr "Réponse"
+
+#, fuzzy
+#~ msgid "Ask a Question"
#~ msgstr "poser une question"
View
2  app/locale/verb.pot
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2012-05-09 05:47+0200\n"
+"POT-Creation-Date: 2012-08-14 12:01+0200\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
View
2  app/views/layouts/default.ctp
@@ -159,7 +159,7 @@
<ul class="tabs" style="float: right;">
<li>
<?=$html->link(
- __('ask a question',true),
+ __('Ask a question',true),
array('controller' => 'posts', 'action' => 'ask')
);
?>
View
26 app/views/posts/ask.ctp
@@ -57,15 +57,15 @@
$("#PostTitle").keyup(function(event){
if($("#PostTitle").val().length < 10) {
- $("#title_status").html('<span class="red">Titles must be at least 10 characters long.</span>');
+ $("#title_status").html('<span class="red"><?= __('Titles must be at least 10 characters long.',true) ?></span>');
} else {
- $("#title_status").html('What is your question about?');
+ $("#title_status").html('<?= __('What is your question about?',true) ?>');
}
});
});
</script>
-<h2>Ask a Question</h2>
+<h2><?= __('Ask a question',true) ?></h2>
<? if ($session->read('errors')) {
foreach($session->read('errors.errors') as $error) {
echo '<div class="error">' . $error . '</div>';
@@ -73,10 +73,10 @@
}
?>
<?=$form->create('Post', array('action' => 'ask'));?>
-<?=$form->label('title');?><br/>
+<?=$form->label(__('Title',true));?><br/>
<?=$form->text('title', array('class' => 'wmd-panel big_input', 'value' => $session->read('errors.data.Post.title')));?><br/>
-<span id="title_status"class="quiet">What is your question about?</span>
+<span id="title_status"class="quiet"><?= __('What is your question about?',true) ?></span>
<div id="resultsContainer"></div>
<div id="wmd-button-bar" class="wmd-panel"></div>
@@ -87,20 +87,20 @@
<div id="wmd-preview" class="wmd-panel"></div>
-<?=$form->label('tags');?><br/>
+<?=$form->label(__('Tags',true));?><br/>
<?=$form->text('tags', array('id' => 'tag_input', 'class' => 'wmd-panel big_input'));?><br/>
-<span id="tag_status" class="quiet">Combine multiple words into single-words.</span>
+<span id="tag_status" class="quiet"><?= __('Combine multiple words into single-words.',true) ?></span>
<? if(!$session->check('Auth.User.id')) { ?>
-<h2>Who Are You?</h2>
-<span class="quiet">Have an account already? <a href="#">Login before answering!</a></span><br/>
- <?=$form->label('name');?><br/>
+<h2><?= __('Who Are You?',true) ?></h2>
+<span class="quiet"><?= __('Have an account already?',true) ?> <a href="#"><?= __('Login before answering!',true) ?></a></span><br/>
+ <?=$form->label(__('Name',true));?><br/>
<?=$form->text('User.username', array(
'class' => 'big_input medium_input',
'value' => $session->read('errors.data.User.username')
));
?><br/>
- <?=$form->label('email');?><br/>
+ <?=$form->label(__('Email',true));?><br/>
<?=$form->text('User.email', array(
'class' => 'big_input medium_input',
'value' => $session->read('errors.data.User.email')
@@ -109,9 +109,9 @@
<? } ?>
<br/><br/>
<?=$form->checkbox('Post.notify', array('checked' => true));?>
-<span style="margin-left: 5px;">Notify me when my question is answered.</span>
+<span style="margin-left: 5px;"><?= __('Notify me when my question is answered.',true) ?></span>
<?$recaptcha->display_form('echo');?>
-<?=$form->end('Ask Your Question');?>
+<?=$form->end( __('Ask a question',true));?>
Something went wrong with that request. Please try again.