Merge branch 'master' into share_api

Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php

1 files changed, 93 insertions, 0 deletions

diff --git a/apps/shorty/lib/l10n.php b/apps/shorty/lib/l10n.php
new file mode 100644
index 00000000000..648130645a0
--- /dev/null
+++ b/apps/shorty/lib/l10n.php
@@ -0,0 +1,93 @@
+<?php
+/**
+* @package shorty an ownCloud url shortener plugin
+* @category internet
+* @author Christian Reiner
+* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
+* @license GNU Affero General Public license (AGPL)
+* @link information 
+* @link repository https://svn.christian-reiner.info/svn/app/oc/shorty
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the license, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.
+* If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/**
+ * @file lib/l10n.php
+ * Translation singleton
+ * @author Christian Reiner
+ */
+
+/**
+ * @class OC_Shorty_L10n
+ * @brief Convenient translation singleton
+ * @access public
+ * @author Christian Reiner
+ */
+class OC_Shorty_L10n
+{
+  /**
+   * @var OC_Shorty_L10n::dictionary
+   * @brief An internal dictionary file filled from the translation files provided.
+   * @access private
+   * @author Christian Reiner
+   */
+  private $dictionary;
+
+    /**
+   * @var OC_Shorty_L10n::instance
+   * @brief Internal singleton object
+   * @access private
+   * @author Christian Reiner
+   */
+  static private $instance=NULL;
+
+  /**
+   * @method OC_Shorty_L10n::__construct
+   * @brief
+   * @access private
+   * @author Christian Reiner
+   */
+  private function __construct ( ) { $this->dictionary = new OC_L10n('shorty'); }
+
+  /**
+   * @method OC_Shorty_L10n::t
+   * @brief Translates a given string into the users session language and fills any placeolders
+   * @param phrase to be translated
+   * @param … further arguments used as filling tokens in the tradition of printf strategies
+   * @returns translated phrase or the original phrase incase no translation could be found
+   * @access public
+   * @author Christian Reiner
+   */
+  static public function t ( $phrase )
+  {
+    // create singleton instance, if required
+    if ( ! self::$instance )
+      self::$instance = new OC_Shorty_L10n ( );
+    // handle different styles of how arguments can be handed over to this method
+    switch ( func_num_args() )
+    {
+      case 1:   return self::$instance->dictionary->t ( $phrase, array() );
+      case 2:   $arg = func_get_arg(1);
+                if ( is_array($arg) )
+                     return self::$instance->dictionary->t ( $phrase, $arg );
+                else return self::$instance->dictionary->t ( $phrase, array($arg) );
+      default:  $args = func_get_args();
+                array_shift ( $args );
+                return self::$instance->dictionary->t ( $phrase, $args );
+    }
+  }
+} // class OC_Shorty_L10n
+?>