Merge branch '3.6-rc'

[friendica-addons.git] / dav / common / wdcal_configuration.php

diff --git a/dav/common/wdcal_configuration.php b/dav/common/wdcal_configuration.php
index 337451cb5ece1f6defd19e33ddf6bb02eb646121..001d4528e9cd9b529b4b21f2cdf783aa0d313cb0 100644 (file)
--- a/dav/common/wdcal_configuration.php
+++ b/dav/common/wdcal_configuration.php
@@ -1,5 +1,6 @@
 <?php
 
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 
 abstract class wdcal_local
@@ -36,7 +37,7 @@ abstract class wdcal_local
         * @return wdcal_local
         */
        static function getInstanceByUser($uid = 0) {
-               $dateformat = PConfig::get($uid, "dav", "dateformat");
+               $dateformat = get_pconfig($uid, "dav", "dateformat");
                $format = self::getInstance($dateformat);
                if ($format == null) $format = self::getInstance(self::LOCAL_US);
                return $format;
@@ -147,7 +148,7 @@ class wdcal_local_us extends wdcal_local {
         * @return string
         */
        static function getName() {
-               return t("U.S. Time Format (mm/dd/YYYY)");
+               return L10n::t("U.S. Time Format (mm/dd/YYYY)");
        }
 
        /**
@@ -242,7 +243,7 @@ class wdcal_local_de extends  wdcal_local {
         * @return string
         */
        static function getName() {
-               return t("German Time Format (dd.mm.YYYY)");
+               return L10n::t("German Time Format (dd.mm.YYYY)");
        }
 
        /**