From b5ed1f8ebd210e5fcbfe36a8610a186f755da600 Mon Sep 17 00:00:00 2001
From: Evgeny Gryaznov <inspirer@users.sourceforge.net>
Date: Fri, 28 Nov 2008 12:18:27 +0000
Subject: [PATCH] 1.5.0 beta1 (added separate locale for locale names, nice
footer)
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@212 c66351dc-e62f-0410-b875-e3a5c0b9693f
---
src/messenger/js/common.js | 2 +-
src/messenger/webim/INSTALL.txt | 2 +-
src/messenger/webim/INSTALL_RUS.txt | 2 +-
src/messenger/webim/install/view_index.php | 2 +-
src/messenger/webim/install/view_installerr.php | 2 +-
src/messenger/webim/libs/common.php | 6 +++---
src/messenger/webim/locales/en/properties | 4 ++--
src/messenger/webim/locales/names/properties | 6 ++++++
src/messenger/webim/locales/sp/properties | 4 ++--
src/messenger/webim/operator/login.php | 2 +-
src/messenger/webim/view/login.php | 3 ++-
src/messenger/webim/view/menu.php | 2 +-
12 files changed, 22 insertions(+), 15 deletions(-)
create mode 100644 src/messenger/webim/locales/names/properties
diff --git a/src/messenger/js/common.js b/src/messenger/js/common.js
index 504f8742..8e163548 100644
--- a/src/messenger/js/common.js
+++ b/src/messenger/js/common.js
@@ -1,5 +1,5 @@
/*
- * Web Messenger common script
+ * Open Web Messenger common script
* http://sourceforge.net/projects/webim
*
* Based on Prototype JavaScript framework, version 1.3.1
diff --git a/src/messenger/webim/INSTALL.txt b/src/messenger/webim/INSTALL.txt
index 21e905c7..dbc89b04 100644
--- a/src/messenger/webim/INSTALL.txt
+++ b/src/messenger/webim/INSTALL.txt
@@ -1,5 +1,5 @@
-Web Instant Messenger
+Open Web Messenger
Copyright (c) 2005-2008 Web Messenger Creators Community.
All rights reserved. This program and the accompanying materials
diff --git a/src/messenger/webim/INSTALL_RUS.txt b/src/messenger/webim/INSTALL_RUS.txt
index 6557d08c..ab3b1e54 100644
--- a/src/messenger/webim/INSTALL_RUS.txt
+++ b/src/messenger/webim/INSTALL_RUS.txt
@@ -1,5 +1,5 @@
-Web Instant Messenger
+Open Web Messenger
Copyright (c) 2005-2008 ���������� ������������� Web Messenger.
��� ����� ��������. ������ ����������� ����������� � ������������� ���������
diff --git a/src/messenger/webim/install/view_index.php b/src/messenger/webim/install/view_index.php
index a6636624..dff60550 100644
--- a/src/messenger/webim/install/view_index.php
+++ b/src/messenger/webim/install/view_index.php
@@ -97,7 +97,7 @@
</tr>
</table>
-Web Messenger/<?php echo $page['version'] ?> • <?php echo $page['localeLinks'] ?> • <a href="<?php echo $webimroot ?>/epl-v10.html" target="_blank"><?php echo getlocal("install.license") ?></a>
+«<span style="color:#bb5500;">Open</span> Web Messenger» <?php echo $page['version'] ?> • <?php echo $page['localeLinks'] ?> • <a href="<?php echo $webimroot ?>/epl-v10.html" target="_blank"><?php echo getlocal("install.license") ?></a>
</td>
</tr>
diff --git a/src/messenger/webim/install/view_installerr.php b/src/messenger/webim/install/view_installerr.php
index bd243e5d..41310e82 100644
--- a/src/messenger/webim/install/view_installerr.php
+++ b/src/messenger/webim/install/view_installerr.php
@@ -74,7 +74,7 @@
</tr>
</table>
-Web Messenger/<?php echo $page['version'] ?> • <?php echo $page['localeLinks'] ?> • <a href="<?php echo $webimroot ?>/epl-v10.html" target="_blank"><?php echo getlocal("install.license") ?></a>
+«<span style="color:#bb5500;">Open</span> Web Messenger» <?php echo $page['version'] ?> • <?php echo $page['localeLinks'] ?> • <a href="<?php echo $webimroot ?>/epl-v10.html" target="_blank"><?php echo getlocal("install.license") ?></a>
</td>
</tr>
diff --git a/src/messenger/webim/libs/common.php b/src/messenger/webim/libs/common.php
index 6e268bcc..d3c3303d 100644
--- a/src/messenger/webim/libs/common.php
+++ b/src/messenger/webim/libs/common.php
@@ -17,7 +17,7 @@ session_start();
require_once(dirname(__FILE__).'/converter.php');
require_once(dirname(__FILE__).'/config.php');
-$version = 'v1.4.3';
+$version = '1.5.0 beta 1';
function myiconv($in_enc, $out_enc, $string) {
global $_utf8win1251, $_win1251utf8;
@@ -119,9 +119,9 @@ function get_locale_links($href) {
if( strlen($localeLinks) > 0 )
$localeLinks .= " • ";
if( $k == $current_locale )
- $localeLinks .= $k;
+ $localeLinks .= getlocal_($k, "names");
else
- $localeLinks .= "<a href=\"$href?locale=$k\">$k</a>";
+ $localeLinks .= "<a href=\"$href?locale=$k\">".getlocal_($k, "names")."</a>";
}
return $localeLinks;
}
diff --git a/src/messenger/webim/locales/en/properties b/src/messenger/webim/locales/en/properties
index 1c7e94d5..0f879c70 100644
--- a/src/messenger/webim/locales/en/properties
+++ b/src/messenger/webim/locales/en/properties
@@ -13,8 +13,8 @@ page_login.remember=Remember
page_login.error=Entered login/password is incorrect
agent.not_logged_in=Your session is expired please login again
page_client.pending_users=Your can find awaiting visitors.
-chat.window.title.agent=Web Messenger
-chat.window.title.user=Web Messenger
+chat.window.title.agent=Open Web Messenger
+chat.window.title.user=Open Web Messenger
chat.window.product_name=Web <span class="grey">Messenger</span>
chat.window.close_title=Close chat
chat.window.chatting_with=You chat with:
diff --git a/src/messenger/webim/locales/names/properties b/src/messenger/webim/locales/names/properties
new file mode 100644
index 00000000..cf7906dd
--- /dev/null
+++ b/src/messenger/webim/locales/names/properties
@@ -0,0 +1,6 @@
+encoding=utf-8
+
+en=English
+fr=Français
+sp=Español
+ru=Russian
diff --git a/src/messenger/webim/locales/sp/properties b/src/messenger/webim/locales/sp/properties
index eab9bae7..59dcee3f 100644
--- a/src/messenger/webim/locales/sp/properties
+++ b/src/messenger/webim/locales/sp/properties
@@ -13,8 +13,8 @@ page_login.remember=Recordar
page_login.error=Usuario/password incorrecto
agent.not_logged_in=Su session a expirado por favor accese de nuevo
page_client.pending_users=Puedes encontrar visitantes en espera.
-chat.window.title.agent=Web Messenger
-chat.window.title.user=Web Messenger
+chat.window.title.agent=Open Web Messenger
+chat.window.title.user=Open Web Messenger
chat.window.product_name=Web <span class="grey">Messenger</span>
chat.window.close_title=Cerrar conversacion
chat.window.chatting_with=Esta en conversacion con:
diff --git a/src/messenger/webim/operator/login.php b/src/messenger/webim/operator/login.php
index 885f4e7d..bc1a1074 100644
--- a/src/messenger/webim/operator/login.php
+++ b/src/messenger/webim/operator/login.php
@@ -36,7 +36,7 @@ if( isset($_POST['login']) && isset($_POST['password']) ) {
}
}
-$page = array( 'backPath' => '', 'formisRemember' => true );
+$page = array( 'backPath' => '', 'formisRemember' => true, 'version' => $version, 'localeLinks' => get_locale_links("$webimroot/operator/login.php") );
start_html_output();
require('../view/login.php');
?>
\ No newline at end of file
diff --git a/src/messenger/webim/view/login.php b/src/messenger/webim/view/login.php
index 07935a19..4851377d 100644
--- a/src/messenger/webim/view/login.php
+++ b/src/messenger/webim/view/login.php
@@ -114,7 +114,8 @@
</table></td><td></td></tr><tr><td><img src='<?php echo $webimroot ?>/images/logincrnlb.gif' width='16' height='16' border='0' alt=''></td><td></td><td><img src='<?php echo $webimroot ?>/images/logincrnrb.gif' width='16' height='16' border='0' alt=''></td></tr></table></td></tr></table>
</form>
-
+<br/>
+«<span style="color:#bb5500;">Open</span> Web Messenger» <?php echo $page['version'] ?> • <?php echo $page['localeLinks'] ?>
</td>
</tr>
</table>
diff --git a/src/messenger/webim/view/menu.php b/src/messenger/webim/view/menu.php
index 77021100..b4e20325 100644
--- a/src/messenger/webim/view/menu.php
+++ b/src/messenger/webim/view/menu.php
@@ -74,7 +74,7 @@
</tr>
</table>
-Web Messenger/<?php echo $page['version'] ?> • <?php echo $page['localeLinks'] ?>
+«<span style="color:#bb5500;">Open</span> Web Messenger» <?php echo $page['version'] ?> • <?php echo $page['localeLinks'] ?>
</td>
</tr>