The branch, master has been updated
       via  fc1f74306a4d29e1b7e2866b3fb24b274e290bae (commit)
       via  64a33bd6bcb31fa96d97f9c35602d529f5db340c (commit)
       via  b0951818b5c315b84fda9854c05e0dbbb8eb8d75 (commit)
      from  81ad258b11b9a74e65113d222d97169efb70d2a6 (commit)


- Log -----------------------------------------------------------------
commit fc1f74306a4d29e1b7e2866b3fb24b274e290bae
Author: Michal Čihař <[email protected]>
Date:   Wed Aug 10 16:09:44 2011 +0200

    Avoid introducing new string to translate, this fits better

commit 64a33bd6bcb31fa96d97f9c35602d529f5db340c
Author: Michal Čihař <[email protected]>
Date:   Wed Aug 10 16:01:47 2011 +0200

    Also do aliases

commit b0951818b5c315b84fda9854c05e0dbbb8eb8d75
Author: Michal Čihař <[email protected]>
Date:   Wed Aug 10 15:59:28 2011 +0200

    Add class for creating PDF document

-----------------------------------------------------------------------

Summary of changes:
 libraries/select_lang.lib.php |    2 +-
 test/classes/PMA_PDF_test.php |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletions(-)
 create mode 100644 test/classes/PMA_PDF_test.php

diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index 0842001..f4030ef 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -479,7 +479,7 @@ $GLOBALS['l']['a_meta_dir'] = $GLOBALS['text_dir'];
 $GLOBALS['l']['a_meta_language'] = $GLOBALS['lang'];
 
 /* TCPDF translations */
-$GLOBALS['l']['w_page'] = _pgettext('PDF', 'page');
+$GLOBALS['l']['w_page'] = __('Page number:');
 
 
 // now, that we have loaded the language strings we can send the errors
diff --git a/test/classes/PMA_PDF_test.php b/test/classes/PMA_PDF_test.php
new file mode 100644
index 0000000..1f7931c
--- /dev/null
+++ b/test/classes/PMA_PDF_test.php
@@ -0,0 +1,35 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * tests for PMA_PDF class
+ *
+ * @package phpMyAdmin-test
+ */
+
+/*
+ * Include to test.
+ */
+require_once 'libraries/common.lib.php';
+require_once 'libraries/PDF.class.php';
+require_once 'libraries/php-gettext/gettext.inc';
+
+if (!defined('PMA_VERSION')) {
+    define('PMA_VERSION', 'TEST');
+}
+
+class PMA_PDF_test extends PHPUnit_Framework_TestCase
+{
+    public function testBasic()
+    {
+        $arr = new PMA_PDF();
+        $this->assertContains('PDF', $arr->getPDFData());
+    }
+
+    public function testAlias()
+    {
+        $arr = new PMA_PDF();
+        $arr->SetAlias('{00}', '32');
+        $this->assertContains('PDF', $arr->getPDFData());
+    }
+}
+?>


hooks/post-receive
-- 
phpMyAdmin

------------------------------------------------------------------------------
uberSVN's rich system and user administration capabilities and model 
configuration take the hassle out of deploying and managing Subversion and 
the tools developers use with it. Learn more about uberSVN and get a free 
download at:  http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to