Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'toothbrush/framadate-release/0.9'

Browse Source 
Conflicts:
	locale/en.json
This commit is contained in:
Olivier Perez 2015-09-23 13:41:07 +02:00
commit 929d92da6b
5 changed files with 104 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
adminstuds.php
View File

@ -67,7 +67,7 @@ function sendUpdateNotification($poll, $mailService, $type) {
if ($poll->receiveNewVotes) { if ($poll->receiveNewVotes) {
$subject = '[' . NOMAPPLICATION . '] ' . __('Mail', 'Notification of poll') . ' : ' . $poll->title; $subject = '[' . NOMAPPLICATION . '] ' . __('Mail', 'Notification of poll') . ': ' . $poll->title;
$message = ''; $message = '';
switch ($type) { switch ($type) {
@ -433,4 +433,4 @@ $smarty->assign('admin', true);
$smarty->assign('hidden', false); $smarty->assign('hidden', false);
$smarty->assign('parameter_name_regex', NAME_REGEX); $smarty->assign('parameter_name_regex', NAME_REGEX);
$smarty->display('studs.tpl'); $smarty->display('studs.tpl');

4
create_classic_poll.php
View File

@ -111,8 +111,8 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || (
$message_admin = sprintf($message_admin, Utils::getUrlSondage($admin_poll_id, true)); $message_admin = sprintf($message_admin, Utils::getUrlSondage($admin_poll_id, true));
if ($mailService->isValidEmail($_SESSION['form']->admin_mail)) { if ($mailService->isValidEmail($_SESSION['form']->admin_mail)) {
$mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ' : ' . Utils::htmlEscape($_SESSION['form']->title), $message_admin); $mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($_SESSION['form']->title), $message_admin);
$mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ' : ' . Utils::htmlEscape($_SESSION['form']->title), $message); $mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($_SESSION['form']->title), $message);
} }
} }

6
create_date_poll.php
View File

@ -108,8 +108,8 @@ if (!isset($_SESSION['form']->title) || !isset($_SESSION['form']->admin_name) ||
$message_admin = sprintf($message_admin, Utils::getUrlSondage($admin_poll_id, true)); $message_admin = sprintf($message_admin, Utils::getUrlSondage($admin_poll_id, true));
if ($mailService->isValidEmail($_SESSION['form']->admin_mail)) { if ($mailService->isValidEmail($_SESSION['form']->admin_mail)) {
$mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ' : ' . Utils::htmlEscape($_SESSION['form']->title), $message_admin); $mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($_SESSION['form']->title), $message_admin);
$mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ' : ' . Utils::htmlEscape($_SESSION['form']->title), $message); $mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($_SESSION['form']->title), $message);
} }
} }
@ -168,7 +168,7 @@ if (!isset($_SESSION['form']->title) || !isset($_SESSION['form']->admin_name) ||
$summary .= '<li>'.strftime($date_format['txt_full'], $choice->getName()); $summary .= '<li>'.strftime($date_format['txt_full'], $choice->getName());
$first = true; $first = true;
foreach ($choice->getSlots() as $slots) { foreach ($choice->getSlots() as $slots) {
$summary .= $first ? ' : ' : ', '; $summary .= $first ? ': ' : ', ';
$summary .= $slots; $summary .= $slots;
$first = false; $first = false;
} }

192
locale/en.json
View File

@ -49,8 +49,8 @@
"MONTH_YEAR": "%B %Y" "MONTH_YEAR": "%B %Y"
}, },
"Language selector": { "Language selector": {
"Select the language": "Select the language", "Select the language": "Select language",
"Change the language": "Change the language" "Change the language": "Change language"
}, },
"Maintenance": { "Maintenance": {
"The application": "The application", "The application": "The application",
@ -63,11 +63,11 @@
"Where are my polls": "Where are my polls" "Where are my polls": "Where are my polls"
}, },
"1st section": { "1st section": {
"What is that?": "What is that?", "What is that?": "What is Framadate?",
"Framadate is an online service for planning an appointment or make a decision quickly and easily. No registration is required.": "Framadate is an online service for planning an appointment or make a decision quickly and easily. No registration is required.", "Framadate is an online service for planning an appointment or make a decision quickly and easily. No registration is required.": "Framadate is an online service for planning an appointment or making a decision quickly and easily. No registration is required.",
"Here is how it works:": "Here is how it works:", "Here is how it works:": "Here is how it works:",
"Make a poll": "Make a poll", "Make a poll": "Create a poll",
"Define dates or subjects to choose": "Define dates or subjects to choose", "Define dates or subjects to choose": "Define dates or subjects to choose from",
"Send the poll link to your friends or colleagues": "Send the poll link to your friends or colleagues", "Send the poll link to your friends or colleagues": "Send the poll link to your friends or colleagues",
"Discuss and make a decision": "Discuss and make a decision", "Discuss and make a decision": "Discuss and make a decision",
"Do you want to": "Do you want to", "Do you want to": "Do you want to",
@ -76,16 +76,16 @@
"2nd section": { "2nd section": {
"The software": "The software", "The software": "The software",
"Framadate was initially based on ": "Framadate was initially based on ", "Framadate was initially based on ": "Framadate was initially based on ",
"a software developed by the University of Strasbourg. Today, it is devevoped by the association Framasoft.": "a software developed by the University of Strasbourg. Today, it is devevoped by the association Framasoft.", "a software developed by the University of Strasbourg. Today, it is devevoped by the association Framasoft.": "software developed by the University of Strasbourg. These days, it is developed by the Framasoft association.",
"This software needs javascript and cookies enabled. It is compatible with the following web browsers:": "This software needs javascript and cookies enabled. It is compatible with the following web browsers:", "This software needs javascript and cookies enabled. It is compatible with the following web browsers:": "This software needs JavaScript and cookies enabled. It is compatible with the following web browsers:",
"It is governed by the": "It is governed by the", "It is governed by the": "Framadate is licensed under the",
"CeCILL-B license": "CeCILL-B license" "CeCILL-B license": "CeCILL-B license"
}, },
"3rd section": { "3rd section": {
"Cultivate your garden": "Cultivate your garden", "Cultivate your garden": "Cultivate your garden",
"To participate in the software development, suggest improvements or simply download it, please visit ": "To participate in the software development, suggest improvements or simply download it, please visit ", "To participate in the software development, suggest improvements or simply download it, please visit ": "To participate in the software development, suggest improvements or simply download it, please visit ",
"the development site": "the development site", "the development site": "the development site",
"If you want to install the software for your own use and thus increase your independence, we help you on:": "If you want to install the software for your own use and thus increase your independence, we help you on:" "If you want to install the software for your own use and thus increase your independence, we help you on:": "If you want to install the software for your own use and thus increase your independence, we can help you at:"
}, },
"PollInfo": { "PollInfo": {
"Remove the poll": "Remove the poll", "Remove the poll": "Remove the poll",
@ -94,81 +94,81 @@
"Print": "Print", "Print": "Print",
"Export to CSV": "Export to CSV", "Export to CSV": "Export to CSV",
"Title": "Title of the poll", "Title": "Title of the poll",
"Edit the title": "Edit the title", "Edit the title": "Edit title",
"Save the new title": "Save the new title", "Save the new title": "Save the new title",
"Cancel the title edit": "Cancel the title edit", "Cancel the title edit": "Cancel the title edit",
"Initiator of the poll": "Initiator of the poll", "Initiator of the poll": "Initiator of the poll",
"Edit the name": "Edit the name", "Edit the name": "Edit name",
"Save the new name": "Save the new name", "Save the new name": "Save the new name",
"Cancel the name edit": "Cancel the name edit", "Cancel the name edit": "Cancel the name edit",
"Email": "Email", "Email": "Email",
"Edit the email adress": "Edit the email adress", "Edit the email adress": "Edit the email address",
"Save the email address": "Save the email address", "Save the email address": "Save the email address",
"Cancel the email address edit": "Cancel the email address edit", "Cancel the email address edit": "Cancel the email address edit",
"Edit the description": "Edit the description", "Edit the description": "Edit the description",
"Save the description": "Save the description", "Save the description": "Save the description",
"Cancel the description edit": "Cancel the description edit", "Cancel the description edit": "Cancel the description edit",
"Public link of the poll": "Public link of the poll", "Public link of the poll": "Public link to the poll",
"Admin link of the poll": "Admin link of the poll", "Admin link of the poll": "Admin link for the poll",
"Expiration date": "Expiration's date", "Expiration date": "Expiry date",
"Edit the expiration date": "Edit the expiration's date", "Edit the expiration date": "Edit the expiry date",
"Save the new expiration date": "Save the new expiration's date", "Save the new expiration date": "Save the new expiration date",
"Cancel the expiration date edit": "Cancel the expiration's date edit", "Cancel the expiration date edit": "Cancel the expiration date edit",
"Poll rules": "Poll rules", "Poll rules": "Poll rules",
"Edit the poll rules": "Edit the poll rules", "Edit the poll rules": "Edit the poll rules",
"Votes and comments are locked": "Votes and comments are locked", "Votes and comments are locked": "Votes and comments are locked",
"Votes and comments are open": "Votes and comments are open", "Votes and comments are open": "Votes and comments are open",
"Votes are editable": "Votes are editable", "Votes are editable": "Votes are modifiable",
"Votes are editable solely by their owner.": "Votes are editable solely by their owner", "Votes are editable solely by their owner.": "Votes can only be edited by their owner",
"Save the new rules": "Save the new rules", "Save the new rules": "Save the new rules",
"Cancel the rules edit": "Cancel the rules edit", "Cancel the rules edit": "Cancel the rules edit",
"Results are hidden.": "Results are hidden.", "Results are hidden.": "Results are hidden.",
"Results are visible.": "Results are visible." "Results are visible.": "Results are visible."
}, },
"Poll results": { "Poll results": {
"Votes of the poll": "Votes of the poll", "Votes of the poll": "Votes",
"Edit the line:": "Edit the line:", "Edit the line:": "Edit line:",
"Remove the line:": "Remove the line:", "Remove the line:": "Remove line:",
"Vote no for": "Vote \"no\" for", "Vote no for": "Vote \"no\" for",
"Vote yes for": "Vote \"yes\" for", "Vote yes for": "Vote \"yes\" for",
"Vote ifneedbe for": "Vote \"ifneedbe\" for", "Vote ifneedbe for": "Vote \"ifneedbe\" for",
"Save the choices": "Save the choices", "Save the choices": "Save choices",
"Addition": "Addition", "Addition": "Total",
"Best choice": "Best choices", "Best choice": "Best choice",
"Best choices": "Best choices", "Best choices": "Best choices",
"The best choice at this time is:": "The best choice at this time is:", "The best choice at this time is:": "The current best choice is:",
"The bests choices at this time are:": "The bests choices at this time are:", "The bests choices at this time are:": "The current best choices are:",
"Scroll to the left": "Scroll to the left", "Scroll to the left": "Scroll to the left",
"Scroll to the right": "Scroll to the right", "Scroll to the right": "Scroll to the right",
"Display the chart of the results": "Display the chart of the results", "Display the chart of the results": "Display the chart of the results",
"Chart": "Chart" "Chart": "Chart"
}, },
"Comments": { "Comments": {
"Comments of polled people": "Comments of polled people", "Comments of polled people": "Comments",
"Remove the comment": "Remove the comment", "Remove the comment": "Remove comment",
"Add a comment to the poll": "Add a comment to the poll", "Add a comment to the poll": "Add a comment to the poll",
"Your comment": "Your comment", "Your comment": "Comment",
"Send the comment": "Send the comment", "Send the comment": "Submit comment",
"anonyme": "anonyme", "anonyme": "anonyme",
"Comment added": "Comment added" "Comment added": "Comment saved"
}, },
"studs": { "studs": {
"If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.": "If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.", "If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.": "If you want to vote in this poll, you have to give your name, make your choice, and submit it with the plus button at the end of the line.",
"POLL_LOCKED_WARNING": "The administration locked this poll. Votes and comments are frozen, it is no longer possible to participate", "POLL_LOCKED_WARNING": "The administrator locked this poll. Votes and comments are frozen, it is no longer possible to participate",
"The poll is expired, it will be deleted soon.": "The poll is expired, it will be deleted soon.", "The poll is expired, it will be deleted soon.": "The poll has expired, it will soon be deleted.",
"Deletion date:": "Deletion date:", "Deletion date:": "Deletion date:",
"Your vote has been registered successfully, but be careful: regarding this poll options, you need to keep this personal link to edit your own vote:": "Your vote has been registered successfully, but be careful: regarding this poll options, you need to keep this personal link to edit your own vote.", "Your vote has been registered successfully, but be careful: regarding this poll options, you need to keep this personal link to edit your own vote:": "Your vote has been saved, but please note: you need to keep this personalised link to be able to edit your vote.",
"Update vote succeeded": "Update vote succeeded", "Update vote succeeded": "Vote updated",
"Adding the vote succeeded": "Adding the vote succeeded" "Adding the vote succeeded": "Vote added"
}, },
"adminstuds": { "adminstuds": {
"As poll administrator, you can change all the lines of this poll with this button": "As poll administrator, you can change all the lines of this poll with this button", "As poll administrator, you can change all the lines of this poll with this button": "As poll administrator, you can change all the lines of this poll with this button",
"remove a column or a line with": "remove a column or a line with", "remove a column or a line with": "remove a column or a line with",
"and add a new column with": "and add a new column with", "and add a new column with": "and add a new column with",
"Finally, you can change the informations of this poll like the title, the comments or your email address.": "Finally, you can change the informations of this poll like the title, the comments or your email address.", "Finally, you can change the informations of this poll like the title, the comments or your email address.": "Finally, you can change the properties of this poll such as the title, the comments or your email address.",
"Column's adding": "Column's adding", "Column's adding": "Adding a column",
"You can add a new scheduling date to your poll.": "You can add a new scheduling date to your poll.", "You can add a new scheduling date to your poll.": "You can add a new scheduling date to your poll.",
"If you just want to add a new hour to an existant date, put the same date and choose a new hour.": "If you just want to add a new hour to an existant date, put the same date and choose a new hour.", "If you just want to add a new hour to an existant date, put the same date and choose a new hour.": "If you just want to add a new time slot to an existing date, add that date here and choose a new time slot.",
"Confirm removal of the poll": "Confirm removal of your poll", "Confirm removal of the poll": "Confirm removal of your poll",
"Delete the poll": "Delete the poll", "Delete the poll": "Delete the poll",
"Keep the poll": "Keep the poll", "Keep the poll": "Keep the poll",
@ -181,13 +181,13 @@
"All votes deleted": "All votes deleted", "All votes deleted": "All votes deleted",
"Back to the poll": "Back to the poll", "Back to the poll": "Back to the poll",
"Add a column": "Add a column", "Add a column": "Add a column",
"Remove the column": "Remove the column", "Remove the column": "Remove column",
"Column removed": "Column deleted", "Column removed": "Column deleted",
"Choice added": "Choice added", "Choice added": "Choice added",
"Confirm removal of all votes of the poll": "Confirm removal of all votes of the poll", "Confirm removal of all votes of the poll": "Confirm removal of all votes",
"Keep the votes": "Keep the votes", "Keep the votes": "Keep the votes",
"Remove the votes": "Remove the votes", "Remove the votes": "Remove the votes",
"Confirm removal of all comments of the poll": "Confirm removal of all comments of the poll", "Confirm removal of all comments of the poll": "Confirm removal of all comments",
"Comment deleted": "Comment deleted", "Comment deleted": "Comment deleted",
"All comments deleted": "All comments deleted", "All comments deleted": "All comments deleted",
"Keep the comments": "Keep the comments", "Keep the comments": "Keep the comments",
@ -197,42 +197,42 @@
"Keep this poll": "Keep this poll" "Keep this poll": "Keep this poll"
}, },
"Step 1": { "Step 1": {
"Poll creation (1 on 3)": "Poll creation (1 on 3)", "Poll creation (1 on 3)": "Poll creation (1 of 3)",
"You are in the poll creation section.": "You are in the poll creation section.", "You are in the poll creation section.": "You are in the poll creation section.",
"Required fields cannot be left blank.": "Required fields cannot be left blank.", "Required fields cannot be left blank.": "Required fields cannot be left blank.",
"Poll title": "Poll title", "Poll title": "Poll title",
"Votes cannot be modified.": "Votes cannot be modified", "Votes cannot be modified.": "Votes cannot be modified",
"All voters can modify any vote": "All voters can modify any vote", "All voters can modify any vote": "All voters can modify any vote",
"Voters can modify their vote themselves": "Voters can modify their vote themselves", "Voters can modify their vote themselves": "Voters can modify their vote themselves",
"To receive an email for each new vote": "To receive an email for each new vote", "To receive an email for each new vote": "Receive an email for each new vote",
"To receive an email for each new comment": "To receive an email for each new comment", "To receive an email for each new comment": "Receive an email for each new comment",
"Only the poll maker can see the poll's results": "Only the poll maker can see the poll's results", "Only the poll maker can see the poll's results": "Only the poll maker can see the poll results",
"Go to step 2": "Go to step 2" "Go to step 2": "Go to step 2"
}, },
"Step 2": { "Step 2": {
"Back to step 1": "Revenir à l’étape 1", "Back to step 1": "Return to step 1",
"Go to step 3": "Aller à l’étape 3" "Go to step 3": "Go to step 3"
}, },
"Step 2 date": { "Step 2 date": {
"Poll dates (2 on 3)": "Poll dates (2 on 3)", "Poll dates (2 on 3)": "Poll dates (2 of 3)",
"Choose the dates of your poll": "Choose the dates of your poll", "Choose the dates of your poll": "Choose dates for your poll",
"To schedule an event you need to propose at least two choices (two hours for one day or two days).": "To schedule an event you need to propose at least two choices (two hours for one day or two days).", "To schedule an event you need to propose at least two choices (two hours for one day or two days).": "To schedule an event you need to provide at least two choices (e.g., two time slots on one day or two days).",
"You can add or remove additionnal days and hours with the buttons": "You can add or remove additionnal days and hours with the buttons", "You can add or remove additionnal days and hours with the buttons": "You can add or remove additional days and times with the buttons",
"For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8h-10h\", \"evening\", etc.)": "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8h-10h\", \"evening\", etc.)", "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8h-10h\", \"evening\", etc.)": "For each selected day, you are free to suggest meeting times (e.g., \"8h\", \"8:30\", \"8h-10h\", \"evening\", etc.)",
"Remove an hour": "Remove an hour", "Remove an hour": "Remove a time slot",
"Add an hour": "Add an hour", "Add an hour": "Add a time slot",
"Copy hours of the first day": "Copy hours of the first day", "Copy hours of the first day": "Copy times from the first day",
"Remove a day": "Remove a day", "Remove a day": "Remove a day",
"Add a day": "Add a day", "Add a day": "Add a day",
"Remove all days": "Remove all days", "Remove all days": "Remove all days",
"Remove all hours": "Remove all hours" "Remove all hours": "Remove all times"
}, },
"Step 2 classic": { "Step 2 classic": {
"Poll subjects (2 on 3)": "Poll subjects (2 on 3)", "Poll subjects (2 on 3)": "Poll options (2 of 3)",
"To make a generic poll you need to propose at least two choices between differents subjects.": "To make a generic poll you need to propose at least two choices between differents subjects.", "To make a generic poll you need to propose at least two choices between differents subjects.": "To create a poll you should provide at least two different choices.",
"You can add or remove additional choices with the buttons": "You can add or remove additional choices with the buttons", "You can add or remove additional choices with the buttons": "You can add or remove choices with the buttons",
"It's possible to propose links or images by using": "It's possible to propose links or images by using", "It's possible to propose links or images by using": "Links or images can be included using",
"the Markdown syntax": "the Markdown syntax", "the Markdown syntax": "Markdown syntax",
"Add a link or an image": "Add a link or an image", "Add a link or an image": "Add a link or an image",
"These fields are optional. You can add a link, an image or both.": "These fields are optional. You can add a link, an image or both.", "These fields are optional. You can add a link, an image or both.": "These fields are optional. You can add a link, an image or both.",
"URL of the image": "URL of the image", "URL of the image": "URL of the image",
@ -242,16 +242,16 @@
}, },
"Step 3": { "Step 3": {
"Back to step 2": "Back to step 2", "Back to step 2": "Back to step 2",
"Removal date and confirmation (3 on 3)": "Removal date and confirmation (3 on 3)", "Removal date and confirmation (3 on 3)": "Removal date and confirmation (1 of 3)",
"Confirm the creation of your poll": "Confirm the creation of your poll", "Confirm the creation of your poll": "Confirm the creation of your poll",
"List of your choices": "List of your choices", "List of your choices": "List of options",
"Once you have confirmed the creation of your poll, you will be automatically redirected on the administration page of your poll.": "Once you have confirmed the creation of your poll, you will be automatically redirected on the administration page of your poll.", "Once you have confirmed the creation of your poll, you will be automatically redirected on the administration page of your poll.": "Once you have confirmed the creation of your poll, you will automatically be redirected to the poll's administration page.",
"Then, you will receive quickly two emails: one contening the link of your poll for sending it to the voters, the other contening the link to the administration page of your poll.": "Then, you will receive quickly two emails: one contening the link of your poll for sending it to the voters, the other contening the link to the administration page of your poll.", "Then, you will receive quickly two emails: one contening the link of your poll for sending it to the voters, the other contening the link to the administration page of your poll.": "Then you will receive two emails: one containing the link of your poll for sending to the participants, the other containing the link to the poll administration page.",
"Create the poll": "Create the poll", "Create the poll": "Create the poll",
"Your poll will automatically be archived": "Your poll will automatically be archived", "Your poll will automatically be archived": "Your poll will automatically be archived",
"after the last date of your poll.": "after the last date of your poll.", "after the last date of your poll.": "after the last date of your poll.",
"You can set a closer archiving date for it.": "You can set a closer archiving date for it.", "You can set a closer archiving date for it.": "You can set a specific expiry date for the poll.",
"Archiving date:": "Date d'archivage :" "Archiving date:": "Expiry date:"
}, },
"Admin": { "Admin": {
"Back to administration": "Back to administration", "Back to administration": "Back to administration",
@ -265,13 +265,13 @@
"Format": "Format", "Format": "Format",
"Title": "Title", "Title": "Title",
"Author": "Author", "Author": "Author",
"Email": "Courriel", "Email": "Email",
"Expiration date": "Date d'expiration", "Expiration date": "Expiry date",
"Votes": "Votes", "Votes": "Votes",
"Actions": "Actions", "Actions": "Actions",
"See the poll": "See the poll", "See the poll": "Go to poll",
"Change the poll": "Change the poll", "Change the poll": "Change poll",
"Deleted the poll": "Deleted the poll", "Deleted the poll": "Delete the poll",
"Summary": "Summary", "Summary": "Summary",
"Success": "Success", "Success": "Success",
"Fail": "Fail", "Fail": "Fail",
@ -291,48 +291,48 @@
"Polls sent": "Polls sent" "Polls sent": "Polls sent"
}, },
"Mail" : { "Mail" : {
"Poll's participation": "Poll's participation", "Poll's participation": "Poll participation",
"Notification of poll": "Notification of poll", "Notification of poll": "Notification of poll",
"filled a vote.\nYou can find your poll at the link": "filled a vote.<br/>You can find your poll at the link", "filled a vote.\nYou can find your poll at the link": "added a vote.<br/>You can visit your poll at the link",
"updated a vote.\nYou can find your poll at the link": "updated a vote.<br/>You can find your poll at the link", "updated a vote.\nYou can find your poll at the link": "updated a vote.<br/>You can visit your poll at the link",
"wrote a comment.\nYou can find your poll at the link": "wrote a comment.<br/>You can find your poll at the link", "wrote a comment.\nYou can find your poll at the link": "wrote a comment.<br/>You can visit your poll at the link",
"Someone just change your poll available at the following link %s.": "Someone just change your poll available at the following link <a href=\"%1$s\">%1$s</a>.", "Someone just change your poll available at the following link %s.": "Someone just changed your poll at the following link <a href=\"%1$s\">%1$s</a>.",
"Someone just delete your poll %s.": "Someone just delete your poll \"%s\".", "Someone just delete your poll %s.": "Someone just deleted your poll \"%s\".",
"Thanks for your trust.": "Thanks for your trust.", "Thanks for your trust.": "Thank you for your trust.",
"FOOTER": "", "FOOTER": "",
"[ADMINISTRATOR] New settings for your poll": "[ADMINISTRATOR] New settings for your poll", "[ADMINISTRATOR] New settings for your poll": "[ADMINISTRATOR] New settings for your poll",
"You have changed the settings of your poll. \nYou can modify this poll with this link": "You have changed the settings of your poll.<br/>You can modify this poll with this link", "You have changed the settings of your poll. \nYou can modify this poll with this link": "You have changed the settings of your poll.<br/>You can modify this poll with this link",
"This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll.":"This is the message you have to send to the people you want to poll.<br/>Now, you have to send this message to everyone you want to poll.", "This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll.":"This is the message to forward to the poll participants.",
"hast just created a poll called": "has just created a poll called", "hast just created a poll called": "has just created a poll called",
"Thanks for filling the poll at the link above": "Thanks for filling the poll at the link above", "Thanks for filling the poll at the link above": "Please fill in the poll at the link above",
"This message should NOT be sent to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above": "This message should NOT be sent to the polled people. It is private for the poll's creator.<br/><br/>You can now modify it at the link above", "This message should NOT be sent to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above": "This message should NOT be sent to the poll participants. You should keep it private. <br/><br/>You can modify your poll at the link above",
"Author's message": "Author's message", "Author's message": "Author's message",
"For sending to the polled users": "For sending to the polled users" "For sending to the polled users": "Participant link"
}, },
"Error": { "Error": {
"Error!": "Error!", "Error!": "Error!",
"Enter a title": "Enter a title", "Enter a title": "Enter a title",
"Something is going wrong...": "Something is going wrong...", "Something is going wrong...": "Something has gone wrong...",
"Something is wrong with the format": "Something is wrong with the format", "Something is wrong with the format": "Something is wrong with the format",
"Enter an email address": "Enter an email address", "Enter an email address": "Enter an email address",
"The address is not correct! You should enter a valid email address (like r.stallman@outlock.com) in order to receive the link to your poll.": "The address is not correct! You should enter a valid email address (like r.stallman@outlock.com) in order to receive the link to your poll.", "The address is not correct! You should enter a valid email address (like r.stallman@outlock.com) in order to receive the link to your poll.": "The address is not correct! You should enter a valid email address (like r.stallman@outlock.com) in order to receive the link to your poll.",
"No polls found": "No polls found", "No polls found": "No polls found",
"There is a problem with your choices": "There is a problem with your choices", "There is a problem with your choices": "There is a problem with your choices",
"You haven't filled the first section of the poll creation.": "You haven't filled the first section of the poll creation.", "You haven't filled the first section of the poll creation.": "You haven't filled in the first section of the poll.",
"Javascript is disabled on your browser. Its activation is required to create a poll.": "Javascript is disabled on your browser. Its activation is required to create a poll.", "Javascript is disabled on your browser. Its activation is required to create a poll.": "JavaScript is disabled on your browser. It is required to create a poll.",
"Cookies are disabled on your browser. Theirs activation is required to create a poll.": "Cookies are disabled on your browser. Theirs activation is required to create a poll.", "Cookies are disabled on your browser. Theirs activation is required to create a poll.": "Cookies are disabled on your browser. They are required to be able to create a poll.",
"This poll doesn't exist !": "This poll doesn't exist !", "This poll doesn't exist !": "This poll doesn't exist!",
"Enter a name": "Enter a name", "Enter a name": "Enter a name",
"The name is invalid.": "The name is invalid.", "The name is invalid.": "The name is invalid.",
"The name you've chosen already exist in this poll!": "The name you've chosen already exist in this poll!", "The name you've chosen already exist in this poll!": "The name you've chosen already exists in this poll!",
"Enter a name and a comment!": "Enter a name and a comment!", "Enter a name and a comment!": "Enter a name and a comment!",
"Failed to insert the comment!": "Failed to insert the comment!", "Failed to insert the comment!": "Failed to insert the comment!",
"Framadate is not properly installed, please check the \"INSTALL\" to setup the database before continuing.": "Framadate is not properly installed, please check the 'INSTALL' to setup the database before continuing.", "Framadate is not properly installed, please check the \"INSTALL\" to setup the database before continuing.": "Framadate is not properly installed, please see the 'INSTALL' file for instructions on setting up the database before continuing.",
"Failed to save poll": "Failed to save poll", "Failed to save poll": "Failed to save poll",
"Update vote failed": "Update vote failed", "Update vote failed": "Update vote failed",
"Adding vote failed": "Adding vote failed", "Adding vote failed": "Adding vote failed",
"Comment failed": "Comment failed", "Comment failed": "Comment failed",
"You can't create a poll with hidden results with the following edition option:": "You can't create a poll with hidden results with the following edition option: ", "You can't create a poll with hidden results with the following edition option:": "You can't create a poll with hidden results with the following option: ",
"Failed to delete column": "Failed to delete column", "Failed to delete column": "Failed to delete column",
"MISSING_VALUES": "Missing values", "MISSING_VALUES": "Missing values",
"CANT_CONNECT_TO_DATABASE": "Unable to connect to database" "CANT_CONNECT_TO_DATABASE": "Unable to connect to database"

2
studs.php
View File

@ -66,7 +66,7 @@ function sendUpdateNotification($poll, $mailService, $name, $type) {
if ($poll->receiveNewVotes) { if ($poll->receiveNewVotes) {
$subject = '[' . NOMAPPLICATION . '] ' . __('Mail', 'Poll\'s participation') . ' : ' . $poll->title; $subject = '[' . NOMAPPLICATION . '] ' . __('Mail', 'Poll\'s participation') . ': ' . $poll->title;
$message = $name . ' '; $message = $name . ' ';
switch ($type) { switch ($type) {