aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--h-source/Application/Include/languages.php17
-rw-r--r--h-source/Application/Include/myFunctions.php25
-rw-r--r--h-source/Application/Views/Wiki/differences.php4
-rw-r--r--h-source/Application/Views/Wiki/form.php4
-rw-r--r--h-source/Application/Views/Wiki/history.php4
-rw-r--r--h-source/Application/Views/Wiki/page.php6
-rw-r--r--h-source/Application/Views/Wiki/talk.php10
-rw-r--r--h-source/Application/Views/talk.php10
8 files changed, 54 insertions, 26 deletions
diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php
index 8429aa0..cbaf6bb 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -317,6 +317,23 @@ class Lang
/*0269*/"Download the xml file of all the <b>modems</b> in the database" => "Scarica il file xml di tutti i <b>modem</b> presenti nel database",
/*0270*/"Modems and ADSL cards" => "Modem e schede ADSL",
/*0271*/"Table of contents" => "Indice dei contenuti",
+ /*0272*/"by" => "da",
+ /*0273*/"Add a message" => "Aggiungi un messaggio",
+ /*0274*/"Save" => "Salva",
+ /*0275*/"Revision of the wiki page" => "Revisione della pagina della wiki",
+ /*0276*/"Preview" => "Anteprima",
+ /*0277*/"January" => "gennaio",
+ /*0278*/"February" => "febbraio",
+ /*0279*/"March" => "marzo",
+ /*0280*/"April" => "aprile",
+ /*0281*/"May" => "maggio",
+ /*0282*/"June" => "giugno",
+ /*0283*/"July" => "luglio",
+ /*0284*/"August" => "agosto",
+ /*0285*/"September" => "settembre",
+ /*0286*/"October" => "ottobre",
+ /*0287*/"November" => "novembre",
+ /*0288*/"December" => "dicembre",
),
'es' => array
(
diff --git a/h-source/Application/Include/myFunctions.php b/h-source/Application/Include/myFunctions.php
index 8c757e7..bb7aa5f 100644
--- a/h-source/Application/Include/myFunctions.php
+++ b/h-source/Application/Include/myFunctions.php
@@ -73,15 +73,26 @@ function titleForRedirect($title)
function smartDate($uglyDate = null, $lang = 'en')
{
- switch ($lang)
+ if (strcmp($lang,'en'))
{
- case 'en':
- $smDate = date('H:i, d F Y',strtotime($uglyDate));
- break;
- default:
- $smDate = date('H:i, d F Y',strtotime($uglyDate));
+ return date('H:i, j F Y',strtotime($uglyDate));
}
- return $smDate;
+ else
+ {
+ return date('H:i, j ',strtotime($uglyDate)).gtext(date('F',strtotime($uglyDate))).date(' Y',strtotime($uglyDate));
+ }
+// switch ($lang)
+// {
+// case 'en':
+// $smDate = date('H:i, d F Y',strtotime($uglyDate));
+// break;
+// case 'it':
+// $smDate = date('H:i, d F Y',strtotime($uglyDate));
+// break;
+// default:
+// $smDate = date('H:i, d F Y',strtotime($uglyDate)).date(' F ',strtotime($uglyDate)).date('Y',strtotime($uglyDate));
+// }
+// return $smDate;
}
function pubDateFormat($uglyDate = null)
diff --git a/h-source/Application/Views/Wiki/differences.php b/h-source/Application/Views/Wiki/differences.php
index ee7a795..9c06714 100644
--- a/h-source/Application/Views/Wiki/differences.php
+++ b/h-source/Application/Views/Wiki/differences.php
@@ -30,7 +30,7 @@
<?php if ($showDiff === true) { ?>
<div class="notebook_view_title">
- Differences between the revision of <b><?php echo smartDate($update_new);?></b>, created by <b><?php echo getLinkToUser($u->getUser($created_by));?></b>, and the revision of <b><?php echo smartDate($update_old);?></b>
+ <?php echo gtext("Differences between the revision of");?> <b><?php echo smartDate($update_new);?></b>, <?php echo gtext("created by");?> <b><?php echo getLinkToUser($u->getUser($created_by));?></b>, <?php echo gtext("and the revision of");?> <b><?php echo smartDate($update_old);?></b>
</div>
<?php } ?>
@@ -41,7 +41,7 @@
<div class="wiki_external_box">
<div class="diff_color_notice">
- <b>Notice</b>: the text in <del>red</del> has been deleted from the previous revision, the text in <ins>green</ins> has been added in this revision and the text in <span class="gray_text_notice">gray</span> has not been changed.
+ <?php echo gtext("<b>Notice</b>: the text in <del>red</del> has been deleted from the previous revision, the text in <ins>green</ins> has been added in this revision and the text in <span class='gray_text_notice'>gray</span> has not been changed.");?>
</div>
<?php foreach ($diffArray as $label => $text) { ?>
diff --git a/h-source/Application/Views/Wiki/form.php b/h-source/Application/Views/Wiki/form.php
index 12d84d1..38a88c4 100644
--- a/h-source/Application/Views/Wiki/form.php
+++ b/h-source/Application/Views/Wiki/form.php
@@ -95,8 +95,8 @@
<?php echo $hiddenInput;?>
- <input type="submit" name="previewAction" value="Preview">
- <input type="submit" name="<?php echo $submitName;?>" value="Save">
+ <input type="submit" name="previewAction" value="<?php echo gtext("Preview");?>">
+ <input type="submit" name="<?php echo $submitName;?>" value="<?php echo gtext("Save");?>">
</div>
diff --git a/h-source/Application/Views/Wiki/history.php b/h-source/Application/Views/Wiki/history.php
index b2e2ab5..e8180f5 100644
--- a/h-source/Application/Views/Wiki/history.php
+++ b/h-source/Application/Views/Wiki/history.php
@@ -42,14 +42,14 @@
<?php if ($this->viewArgs['page'] === 1) { ?>
<?php foreach ($rev1 as $rev) { ?>
- <li class="page_history_current_item"><b><?php echo gtext("Current revision");?>:</b> <?php echo smartDate($rev['wiki']['update_date']);?> by <?php echo $u->getLinkToUserFromId($rev['wiki']['created_by']);?> (<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/0".$this->viewStatus;?>">diff</a>)</li>
+ <li class="page_history_current_item"><b><?php echo gtext("Current revision");?>:</b> <?php echo smartDate($rev['wiki']['update_date']);?> <?php echo gtext("by");?> <?php echo $u->getLinkToUserFromId($rev['wiki']['created_by']);?> (<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/0".$this->viewStatus;?>">diff</a>)</li>
<?php } ?>
<?php } ?>
<?php foreach ($rev2 as $rev) { ?>
<li class="page_history_item">
- <a href="<?php echo $this->baseUrl."/".$this->controller."/revision/$lang/".$rev['wiki_revisions']['id_rev'].$this->viewStatus;?>"><?php echo smartDate($rev['wiki_revisions']['update_date']);?></a> by <?php echo $u->getLinkToUserFromId($rev['wiki_revisions']['created_by']);?>
+ <a href="<?php echo $this->baseUrl."/".$this->controller."/revision/$lang/".$rev['wiki_revisions']['id_rev'].$this->viewStatus;?>"><?php echo smartDate($rev['wiki_revisions']['update_date']);?></a> <?php echo gtext("by");?> <?php echo $u->getLinkToUserFromId($rev['wiki_revisions']['created_by']);?>
<?php if (strcmp($rev['wiki_revisions']['id_rev'],$firstRev) !== 0) {?>
(<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/".$rev['wiki_revisions']['id_rev'].$this->viewStatus;?>">diff</a>)
diff --git a/h-source/Application/Views/Wiki/page.php b/h-source/Application/Views/Wiki/page.php
index afff4bd..1716edc 100644
--- a/h-source/Application/Views/Wiki/page.php
+++ b/h-source/Application/Views/Wiki/page.php
@@ -98,7 +98,7 @@
<?php if (!$isDeleted) { ?>
<div class="talk_numb_ext_wiki">
- <a href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_wiki";?>">talk messages: <?php echo $talk_number;?></a>
+ <a href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_wiki";?>"><?php echo gtext("talk messages");?>: <?php echo $talk_number;?></a>
</div>
<?php } ?>
@@ -109,7 +109,7 @@
</div>
<div class="notebook_view_title">
- Revision of the wiki page <b><?php echo $tree_name;?></b>
+ <?php echo gtext("Revision of the wiki page");?> <b><?php echo $tree_name;?></b>
</div>
<div class="notebook_insert_link">
@@ -125,7 +125,7 @@
<!--if revision-->
<?php if (strcmp($this->action,'revision') === 0) { ?>
<div class="revision_alert">
- This is an old revision of this page, as edited by <b><?php echo $u->getLinkToUserFromId($created_by);?></b> at <b><?php echo smartDate($update_date); ?></b>. It may differ significantly from the <a href="<?php echo $this->baseUrl."/wiki/page/$lang/".encodeUrl($tree_name);?>">current revision</a>.
+ <?php echo gtext("This is an old revision of this page, as edited by");?> <b><?php echo $u->getLinkToUserFromId($created_by);?></b> <?php echo gtext('at');?> <b><?php echo smartDate($update_date); ?></b>. <?php echo gtext("It may differ significantly from the");?> <a href="<?php echo $this->baseUrl."/wiki/page/$lang/".encodeUrl($tree_name);?>"><?php echo gtext("Current revision");?></a></a>.
</div>
<?php } ?>
diff --git a/h-source/Application/Views/Wiki/talk.php b/h-source/Application/Views/Wiki/talk.php
index 3e26527..67947d2 100644
--- a/h-source/Application/Views/Wiki/talk.php
+++ b/h-source/Application/Views/Wiki/talk.php
@@ -66,7 +66,7 @@
</div>
<div class="talk_message_item_date">
- by <?php echo getLinkToUser($u->getUser($message['wiki_talk']['created_by']));?>, <?php echo smartDate($message['wiki_talk']['creation_date']);?>
+ <?php echo gtext("by");?> <?php echo getLinkToUser($u->getUser($message['wiki_talk']['created_by']));?>, <?php echo smartDate($message['wiki_talk']['creation_date']);?>
</div>
</div>
@@ -126,7 +126,7 @@
<div class="talk_form_external_box">
<div class="talk_login_notice">
- <a name="form">Add a message</a>
+ <a name="form"><?php echo gtext("Add a message");?></a>
</div>
<?php echo $notice;?>
@@ -137,16 +137,16 @@
<div class="edit_form">
<div class="form_entry">
- <div class="entry_label">Title:</div>
+ <div class="entry_label"><?php echo gtext("TITLE");?>:</div>
<?php echo Html_Form::input('title',$values['title'],'talk_input_entry');?>
</div>
<div class="form_entry">
- <div class="entry_label">Message:</div>
+ <div class="entry_label"><?php echo gtext("MESSAGE");?>:</div>
<?php echo Html_Form::textarea('message',$values['message'],'talk_textarea_entry','bb_code');?>
</div>
- <input type="submit" name="insertAction" value="Save">
+ <input type="submit" name="insertAction" value="<?php echo gtext("Save");?>">
</div>
diff --git a/h-source/Application/Views/talk.php b/h-source/Application/Views/talk.php
index 6197e24..4f1e1b2 100644
--- a/h-source/Application/Views/talk.php
+++ b/h-source/Application/Views/talk.php
@@ -51,7 +51,7 @@
</div>
<div class="talk_message_item_date">
- by <?php echo getLinkToUser($u->getUser($message['talk']['created_by']));?>, <?php echo smartDate($message['talk']['creation_date']);?>
+ <?php echo gtext("by");?> <?php echo getLinkToUser($u->getUser($message['talk']['created_by']));?>, <?php echo smartDate($message['talk']['creation_date']);?>
</div>
</div>
@@ -111,7 +111,7 @@
<div class="talk_form_external_box">
<div class="talk_login_notice">
- <a name="form">Add a message</a>
+ <a name="form"><?php echo gtext("Add a message");?></a>
</div>
<?php echo $notice;?>
@@ -122,16 +122,16 @@
<div class="edit_form">
<div class="form_entry">
- <div class="entry_label">Title:</div>
+ <div class="entry_label"><?php echo gtext("TITLE");?>:</div>
<?php echo Html_Form::input('title',$values['title'],'talk_input_entry');?>
</div>
<div class="form_entry">
- <div class="entry_label">Message:</div>
+ <div class="entry_label"><?php echo gtext("MESSAGE");?>:</div>
<?php echo Html_Form::textarea('message',$values['message'],'talk_textarea_entry','bb_code');?>
</div>
- <input type="submit" name="insertAction" value="Save">
+ <input type="submit" name="insertAction" value="<?php echo gtext("Save");?>">
</div>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 18:38:41 +0000