[evolvis-commits] r10093: localized news↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Feb 24 17:37:44 CET 2011
Author: mirabilos
Date: 2011-02-24 17:37:43 +0100 (Thu, 24 Feb 2011)
New Revision: 10093
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/www/include/languages/Base.tab
trunk/gforge_base/evolvisforge-5.1/gforge/www/include/languages/French.tab
trunk/gforge_base/evolvisforge-5.1/gforge/www/news/admin/index.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/news/admin/news_admin_utils.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/news/index.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/news/submit.php
Log:
localized news
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/include/languages/Base.tab
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/include/languages/Base.tab 2011-02-24 16:37:42 UTC (rev 10092)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/include/languages/Base.tab 2011-02-24 16:37:43 UTC (rev 10093)
@@ -1157,16 +1157,41 @@
new this_project_has_not This project has not submitted a description
new title New File Releases
new version Version:
-news choose <P>Choose a News item and you can browse, search, and post messages.<P>
+news choose <p>Choose a News item and you can browse, search, and post messages.</p>
news noitems No items were found
news nonews No News Found
news nonewsfor No News Found For $1
+news olderheadlines Older headlines
news section Project: $1
news title News
-news_admin noqueued No Queued Items Found For Project
+news_admin approve_for_frontpage Approve For Front Page
+news_admin approve_newsbyte Approve a NewsByte For Project: $1
+news_admin approved_newsbytes These items were approved this past week (total: $1)
+news_admin date Date
+news_admin details Details
+news_admin do_nothing Do Nothing
+news_admin newsbyte_deleted NewsByte Deleted.
+news_admin newsbyte_not_found NewsByte Not Found.
+news_admin newsbyte_rejected NewsBytes Rejected.
+news_admin newsbytes_to_approve These items need to be approved (total: $1)
+news_admin newsbyte_updated NewsByte Updated.
+news_admin noapproved No approved items found for this week
+news_admin noqueued No Queued Items Found
+news_admin norejected No rejected items found for this week
news_admin permdenied You have to be an admin on the project you are editing or a member of the $1 News team.
+news_admin project Project
news_admin queued These News Items Were Submitted For Project
+news_admin reject Reject
+news_admin reject_selected Reject Selected
+news_admin rejected_newsbytes These items were rejected this past week (total: $1)
+news_admin removal_when_edit If this item is on the $1 home page and you edit it, it will be removed from the home page.
news_admin section News
+news_admin status Status
+news_admin status_delete Delete
+news_admin status_displayed Displayed
+news_admin subject Subject
+news_admin submitted_by Submitted by
+news_admin submitted_for_group Submitted for group
news_admin title News Admin
news_main title News
news_submit cannot You cannot submit news for a project unless you are an admin on that project
@@ -1179,7 +1204,6 @@
news_submit post_blurb You can post news about your project if you are an admin on your project. You may also post "help wanted" notes if your project needs help.<P>All posts <B>for your project</B> will appear instantly on your project summary page. Posts that are of special interest to the community will have to be approved by a member of the $1 news team before they will appear on the $1 home page.<P>You may include URLs, but not HTML in your submissions.<P>URLs that start with http:// are made clickable.
news_submit section News
news_submit subject Subject
-news_submit submit SUBMIT
news_submit title Submit News for $1
news_utils archive News archive
news_utils comment_1 Comment
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/include/languages/French.tab
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/include/languages/French.tab 2011-02-24 16:37:42 UTC (rev 10092)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/include/languages/French.tab 2011-02-24 16:37:43 UTC (rev 10093)
@@ -679,7 +679,7 @@
docman_new upload_file Télécharger vers le serveur
docman_new upload_url OU spécifier une URL externe pour le fichier
error error_creating Erreur de création
-error not_found PAGE NON TROUVEE
+error not_found Page non trouvée
error title La page demandée n'a pas été trouvée (Erreur 404)
exit choose_a_group Erreur - Choisissez un groupe
exit choose_group_body Aucun identifiant de groupe n'a été choisi
@@ -1183,12 +1183,37 @@
news noitems Aucune annonce trouvée
news nonews Aucune annonce
news nonewsfor Aucune annonce trouvée pour $1
+news olderheadlines Anciennes annonces
news section Projet : $1
news title Annonces
-news_admin noqueued Pas d'annonce soumise pour le projet
+news_admin approve_for_frontpage Approuver pour la page d'accueil
+news_admin approve_newsbyte Approuver une annonce pour le projet : $1
+news_admin approved_newsbytes Ces annonces ont été approuvées la semaine passée (total : $1)
+news_admin date Date
+news_admin details Détails
+news_admin do_nothing Ne rien faire
+news_admin newsbyte_deleted Annonce supprimée.
+news_admin newsbyte_not_found Annonce non trouvée.
+news_admin newsbyte_rejected Annonce rejetée.
+news_admin newsbytes_to_approve Ces annonces ont besoin d'être approuvées (total : $1)
+news_admin newsbyte_updated Annonce mise à jour.
+news_admin noapproved Aucune annonce approuvée cette semaine
+news_admin noqueued Pas d'annonce en attente
+news_admin norejected Aucune annonce rejetée cette semaine
news_admin permdenied Vous devez être administrateur du projet que vous éditez ou être membre de l'équipe des annonces de $1.
-news_admin queued Annonces soumises pour le projet
+news_admin project Projet
+news_admin queued Annonces en attente de validation pour le projet
+news_admin reject Rejeter
+news_admin reject_selected Rejeter les annonces sélectionnées
+news_admin rejected_newsbytes Ces annonces ont été rejetées la semaine passée (total : $1)
+news_admin removal_when_edit Si cette annonce se trouve sur la page d'accueil de $1 et que vous la modifiez, elle sera retirée de la page d'accueil.
news_admin section Annonces
+news_admin status Etat
+news_admin status_delete Supprimée
+news_admin status_displayed Affichée
+news_admin subject Sujet
+news_admin submitted_by Proposée par
+news_admin submitted_for_group Proposée pour le projet
news_admin title Administration des Annonces
news_main title Annonces
news_submit cannot Vous ne pouvez soumettre une annonce sans être administrateur de ce projet
@@ -1201,8 +1226,7 @@
news_submit post_blurb Vous pouvez publier une annonce concernant votre projet si vous en êtes administrateur. Vous pouvez également publier des annonces si votre projet a besoin d'aide.</p><p>Toutes les annonces <b>de votre projet</b> apparaîtront immédiatement sur la page de résumé de votre projet. Les annonces d'intérêt général peuvent être sélectionnées par l'équipe $1 pour apparaître sur la page d'accueil $1.</p><p>Vous pouvez inclure des URLs dans vos annonces.
news_submit section Annonces
news_submit subject Sujet
-news_submit submit Envoyer
-news_submit title Soumettre une annonce pour $1
+news_submit title Proposer une annonce pour $1
news_utils archive Archive des annonces
news_utils comment_1 commentaire
news_utils comment_2 commentaires
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/news/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/news/admin/index.php 2011-02-24 16:37:42 UTC (rev 10092)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/news/admin/index.php 2011-02-24 16:37:43 UTC (rev 10093)
@@ -68,9 +68,9 @@
$result=db_query($sql);
if (!$result || db_affected_rows($result) < 1) {
- $feedback .= ' ERROR doing group update ';
+ $feedback .= $Language->getText('general', 'error_on_update');
} else {
- $feedback .= ' Project NewsByte Updated. ';
+ $feedback .= $Language->getText('news_admin', 'newsbyte_updated');
}
/*
Show the list_queue
@@ -80,7 +80,7 @@
}
}
- news_header(array('title'=>'NewsBytes','pagename'=>'news_admin'));
+ news_header(array('title'=>$Language->getText('news_admin', 'title'),'pagename'=>'news_admin'));
if ($approve) {
/*
@@ -90,30 +90,36 @@
$sql="SELECT * FROM news_bytes WHERE id='$id' AND group_id='$group_id'";
$result=db_query($sql);
if (db_numrows($result) < 1) {
- exit_error('Error','Error - none found');
+ exit_error($Language->getText('general', 'error'), $Language->getText('newsbyte_admin', 'newsbyte_not_found'));
}
+
+ $group =& group_get_object($group_id);
+
echo notepad_func();
echo '
- <h3>Approve a NewsByte For Project: '.group_getname($group_id).'</h3>
+ <h3>'.$Language->getText('news_admin', 'approve_newsbyte', array($group->getPublicName())).'</h3>
<p />
<form action="'.$PHP_SELF.'" method="post">
<input type="hidden" name="group_id" value="'.db_result($result,0,'group_id').'" />
- <input type="hidden" name="id" value="'.db_result($result,0,'id').'" />
+ <input type="hidden" name="id" value="'.db_result($result,0,'id').'" />';
- <strong>Submitted by:</strong> '.user_getname(db_result($result,0,'submitted_by')).'<br />
+ $user =& user_get_object(db_result($result,0,'submitted_by'));
+
+ echo '
+ <strong>'.$Language->getText('news_admin', 'submitted_by').':</strong> '.$user->getRealName().'<br />
<input type="hidden" name="approve" value="y" />
<input type="hidden" name="post_changes" value="y" />
- <strong>Status:</strong><br />
- <input type="radio" name="status" value="0" checked="checked" /> Displayed<br />
- <input type="radio" name="status" value="4" /> Delete<br />
+ <strong>'.$Language->getText('news_admin', 'status').':</strong><br />
+ <input type="radio" name="status" value="0" checked="checked" /> '.$Language->getText('news_admin', 'status_displayed').'<br />
+ <input type="radio" name="status" value="4" /> '.$Language->getText('news_admin', 'status_delete').'<br />
- <strong>Subject:</strong><br />
+ <strong>'.$Language->getText('news_admin', 'subject').':</strong><br />
<input type="text" name="summary" value="'.db_result($result,0,'summary').'" size="30" maxlength="60"><br />
- <strong>Details:</strong>'.notepad_button('document.forms[1].details').'<br />
+ <strong>'.$Language->getText('news_admin', 'details').':</strong>'.notepad_button('document.forms[1].details').'<br />
<textarea name="details" rows="5" cols="50">'.db_result($result,0,'details').'</textarea><p>
- <strong>If this item is on the '.$GLOBALS['sys_name'].' home page and you edit it, it will be removed from the home page.</strong><br /></p>
- <input type="submit" name="submit" value="SUBMIT">
+ <strong>'.$Language->getText('news_admin', 'removal_when_edit', array($GLOBALS['sys_name'])).'</strong><br /></p>
+ <input type="submit" name="submit" value="'.$Language->getText('general', 'submit').'" />
</form>';
} else {
@@ -124,19 +130,22 @@
$sql="SELECT * FROM news_bytes WHERE is_approved <> 4 AND group_id='$group_id'";
$result=db_query($sql);
$rows=db_numrows($result);
+ $group =& group_get_object($group_id);
+
if ($rows < 1) {
echo '
- <h4>'.$Language->getText('news_admin','noqueued').': '.group_getname($group_id).'</h4>';
+ <h4>'.$Language->getText('news_admin','noqueued').': '.$group->getPublicName().'</h4>';
} else {
echo '
- <h4>'.$Language->getText('news_admin','queued').': '.group_getname($group_id).'</h4>
- <p>';
+ <h4>'.$Language->getText('news_admin','queued').': '.$group->getPublicName().'</h4>
+ <ul>';
for ($i=0; $i<$rows; $i++) {
echo '
- <a href="/news/admin/?approve=1&id='.db_result($result,$i,'id').'&group_id='.
+ <li><a href="/news/admin/?approve=1&id='.db_result($result,$i,'id').'&group_id='.
db_result($result,$i,'group_id').'">'.
- db_result($result,$i,'summary').'</a><br /></p>';
+ db_result($result,$i,'summary').'</a></li>';
}
+ echo '</ul>';
}
}
@@ -162,9 +171,9 @@
"summary='".htmlspecialchars($summary)."', details='".htmlspecialchars($details)."' WHERE id='$id'";
$result=db_query($sql);
if (!$result || db_affected_rows($result) < 1) {
- $feedback .= ' ERROR doing update ';
+ $feedback .= $Language->getText('general', 'error_on_update');
} else {
- $feedback .= ' NewsByte Updated. ';
+ $feedback .= $Language->getText('news_admin', 'newsbyte_updated');
}
} else if ($status==2) {
/*
@@ -173,10 +182,10 @@
$sql="UPDATE news_bytes SET is_approved='2' WHERE id='$id'";
$result=db_query($sql);
if (!$result || db_affected_rows($result) < 1) {
- $feedback .= ' ERROR doing update ';
+ $feedback .= $Language->getText('general', 'error_on_update');
$feedback .= db_error();
} else {
- $feedback .= ' NewsByte Deleted. ';
+ $feedback .= $Language->getText('news_admin', 'newsbyte_deleted');
}
}
@@ -194,15 +203,15 @@
."WHERE id IN ('".implode($news_id,"','")."')";
$result=db_query($sql);
if (!$result || db_affected_rows($result) < 1) {
- $feedback .= ' ERROR doing update ';
+ $feedback .= $Language->getText('general', 'error_on_update');
$feedback .= db_error();
} else {
- $feedback .= ' NewsBytes Rejected. ';
+ $feedback .= $Language->getText('news_admin', 'newsbyte_rejected');
}
}
}
- news_header(array('title'=>'NewsBytes','pagename'=>'news_admin'));
+ news_header(array('title'=>$Language->getText('news_admin', 'title'),'pagename'=>'news_admin'));
if ($approve) {
/*
@@ -214,27 +223,30 @@
"AND news_bytes.group_id=groups.group_id ";
$result=db_query($sql);
if (db_numrows($result) < 1) {
- exit_error('Error','Error - not found');
+ exit_error($Language->getText('general', 'error'), $Language->getText('newsbyte_admin', 'newsbyte_not_found'));
}
+
+ $group =& group_get_object(db_result($result,0,'group_id'));
+ $user =& user_get_object(db_result($result,0,'submitted_by'));
echo '
- <h3>Approve a NewsByte</h3>
+ <h3>'.$Language->getText('news_admin', 'approve_newsbyte', array($group->getPublicName())).'</h3>
<p />
<form action="'.$PHP_SELF.'" method="post">
<input type="hidden" name="for_group" value="'.db_result($result,0,'group_id').'" />
<input type="hidden" name="id" value="'.db_result($result,0,'id').'" />
- <strong>Submitted for group:</strong> <a href="/projects/'.strtolower(db_result($result,0,'unix_group_name')).'/">'.group_getname(db_result($result,0,'group_id')).'</a><br />
- <strong>Submitted by:</strong> '.user_getname(db_result($result,0,'submitted_by')).'<br />
+ <strong>'.$Language->getText('news_admin', 'submitted_for_group').':</strong> <a href="/projects/'.strtolower(db_result($result,0,'unix_group_name')).'/">'.$group->getPublicName().'</a><br />
+ <strong>'.$Language->getText('news_admin', 'submitted_by').':</strong> '.$user->getRealName().'<br />
<input type="hidden" name="approve" value="y" />
<input type="hidden" name="post_changes" value="y" />
- <input type="radio" name="status" value="1" /> Approve For Front Page<br />
- <input type="radio" name="status" value="0" /> Do Nothing<br />
- <input type="radio" name="status" value="2" checked="checked" /> Delete<br />
- <strong>Subject:</strong><br />
+ <input type="radio" name="status" value="1" /> '.$Language->getText('news_admin', 'approve_for_frontpage').'<br />
+ <input type="radio" name="status" value="0" /> '.$Language->getText('news_admin', 'do_nothing').'<br />
+ <input type="radio" name="status" value="2" checked="checked" /> '.$Language->getText('news_admin', 'reject').'<br />
+ <strong>'.$Language->getText('news_admin', 'subject').':</strong><br />
<input type="text" name="summary" value="'.db_result($result,0,'summary').'" size="30" maxlength="60" /><br />
- <strong>Details:</strong><br />
+ <strong>'.$Language->getText('news_admin', 'details').':</strong><br />
<textarea name="details" rows="5" cols="50">'.db_result($result,0,'details').'</textarea><br />
- <input type="submit" name="submit" value="SUBMIT" />
+ <input type="submit" name="submit" value="'.$Language->getText('general', 'submit').'" />
</form>';
} else {
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/news/admin/news_admin_utils.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/news/admin/news_admin_utils.php 2011-02-24 16:37:42 UTC (rev 10092)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/news/admin/news_admin_utils.php 2011-02-24 16:37:43 UTC (rev 10093)
@@ -26,7 +26,7 @@
*/
function show_news_approve_form($sql_pending, $sql_rejected, $sql_approved) {
-
+ global $Language;
/*
Show list of waiting news items
*/
@@ -34,22 +34,21 @@
// function to show single news item
// factored out because called 3 time below
function show_news_item($result,$i,$approved,$selectable) {
+ global $PHP_SELF,$HTML, $sys_shortdatefmt;
- global $PHP_SELF,$HTML;
-
- echo '<tr '. $HTML->boxGetAltRowStyle($i) . '><td>';
+ echo '<tr '. $HTML->boxGetAltRowStyle($i) . '><td width="20%">';
if ($selectable) {
echo '<input type="checkbox" '
.'name="news_id[]" value="'
.db_result($result, $i, 'id').'" />';
}
- echo date('Y-m-d', db_result($result,$i,'post_date')).'</td>
- <td>';
+ echo date($sys_shortdatefmt, db_result($result,$i,'post_date')).'</td>
+ <td width="45%">';
echo '
<a href="'.$PHP_SELF.'?approve=1&id='.db_result($result,$i,'id').'">'.db_result($result,$i,'summary').'</a>
</td>
- <td>
+ <td width="35%">
<a href="/projects/'
.db_result($result,$i,'unix_group_name').'/">'
.db_result($result,$i,'group_name')
@@ -60,10 +59,11 @@
;
}
- $title_arr=array();
- $title_arr[]='Date';
- $title_arr[]='Title';
- $title_arr[]='Project';
+ $title_arr=array(
+ $Language->getText('news_admin', 'date'),
+ $Language->getText('news_admin', 'subject'),
+ $Language->getText('news_admin', 'project')
+ );
$result=db_query($sql_pending);
$rows=db_numrows($result);
@@ -74,15 +74,15 @@
if ($rows < 1) {
echo '
- <h4>No Queued Items Found</h4>';
+ <h4>'.$Language->getText('news_admin', 'noqueued').'</h4>';
} else {
- echo '<h4>These items need to be approved (total: '.$rows.')</h4>';
+ echo '<h4>'.$Language->getText('news_admin', 'newsbytes_to_approve', array($rows)).'</h4>';
echo $GLOBALS['HTML']->listTableTop($title_arr);
for ($i=0; $i<$rows; $i++) {
show_news_item($result,$i,false,true);
}
echo $GLOBALS['HTML']->listTableBottom();
- echo '<br /><input type="submit" name="submit" value="Reject Selected" />';
+ echo '<br /><input type="submit" name="submit" value="'.$Language->getText('news_admin', 'reject_selected').'" />';
}
echo '</form>';
@@ -94,9 +94,9 @@
$rows=db_numrows($result);
if ($rows < 1) {
echo '
- <h4>No rejected items found for this week</h4>';
+ <h4>'.$Language->getText('news_admin', 'norejected').'</h4>';
} else {
- echo '<h4>These items were rejected this past week (total: '.$rows.')</h4>';
+ echo '<h4>'.$Language->getText('news_admin', 'rejected_newsbytes', array($rows)).'</h4>';
echo $GLOBALS['HTML']->listTableTop($title_arr);
for ($i=0; $i<$rows; $i++) {
show_news_item($result,$i,false,false);
@@ -112,9 +112,9 @@
$rows=db_numrows($result);
if ($rows < 1) {
echo '
- <h4>No approved items found for this week</h4>';
+ <h4>'.$Language->getText('news_admin', 'noapproved').'</h4>';
} else {
- echo '<h4>These items were approved this past week (total: '.$rows.')</h4>';
+ echo '<h4>'.$Language->getText('news_admin', 'approved_newsbytes', array($rows)).'</h4>';
echo $GLOBALS['HTML']->listTableTop($title_arr);
for ($i=0; $i<$rows; $i++) {
show_news_item($result,$i,true,false);
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/news/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/news/index.php 2011-02-24 16:37:42 UTC (rev 10092)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/news/index.php 2011-02-24 16:37:43 UTC (rev 10093)
@@ -29,7 +29,7 @@
require_once('www/news/news_utils.php');
require_once('common/forum/Forum.class');
-news_header(array('title'=>'News','pagename'=>'news','sectionvals'=>array(group_getname($group_id))));
+news_header(array('title'=>$Language->getText('news', 'title'),'pagename'=>'news','sectionvals'=>array(group_getname($group_id))));
echo $Language->getText('news', 'choose');
@@ -76,7 +76,7 @@
if ($more) {
echo '<br /><a href="'
.'?group_id='.$group_id.'&limit='.$limit
- .'&offset='. (string)($offset+$limit) .'">[Older headlines]</a>';
+ .'&offset='. (string)($offset+$limit) .'">['.$Language->getText('news', 'olderheadlines').']</a>';
}
echo '
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/news/submit.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/news/submit.php 2011-02-24 16:37:42 UTC (rev 10092)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/news/submit.php 2011-02-24 16:37:43 UTC (rev 10093)
@@ -84,16 +84,17 @@
/*
Show the submit form
*/
- news_header(array('title'=>'News','pagename'=>'news_submit','titlevals'=>array(group_getname($group_id))));
+ news_header(array('title'=>$Language->getText('news', 'title'),'pagename'=>'news_submit','titlevals'=>array(group_getname($group_id))));
$jsfunc = notepad_func();
+ $group = group_get_object($group_id);
echo '
<p>
'. $Language->getText('news_submit', 'post_blurb', $GLOBALS['sys_name']) .'</p>' . $jsfunc .
'<p>
<form action="'.$PHP_SELF.'" method="post">
<input type="hidden" name="group_id" value="'.$group_id.'" />
- <strong>'.$Language->getText('news_submit', 'forproject').': '. group_getname($group_id) .'</strong>
+ <strong>'.$Language->getText('news_submit', 'forproject').': '.$group->getPublicName().'</strong>
<input type="hidden" name="post_changes" value="y" /></p>
<p>
<strong>'.$Language->getText('news_submit', 'subject').':</strong>'.utils_requiredField().'<br />
@@ -101,7 +102,7 @@
<p>
<strong>'.$Language->getText('news_submit', 'details').':</strong>'.notepad_button('document.forms[1].details').utils_requiredField().'<br />
<textarea name="details" rows="5" cols="50" wrap="soft"></textarea><br />
- <input type="submit" name="submit" value="'.$Language->getText('news_submit', 'submit').'" />
+ <input type="submit" name="submit" value="'.$Language->getText('general', 'submit').'" />
</form></p>';
news_footer(array());
More information about the evolvis-commits
mailing list