+ *
+ * @var string|null
+ * @see get_type()
+ */
+ var $type;
+
/**
* Constructor, used to input the data
*
- * @param string $term
- * @param string $scheme
- * @param string $label
+ * @param string|null $term
+ * @param string|null $scheme
+ * @param string|null $label
+ * @param string|null $type
*/
- public function __construct($term = null, $scheme = null, $label = null)
+ public function __construct($term = null, $scheme = null, $label = null, $type = null)
{
$this->term = $term;
$this->scheme = $scheme;
$this->label = $label;
+ $this->type = $type;
}
/**
@@ -109,14 +122,7 @@ class SimplePie_Category
*/
public function get_term()
{
- if ($this->term !== null)
- {
- return $this->term;
- }
- else
- {
- return null;
- }
+ return $this->term;
}
/**
@@ -126,31 +132,32 @@ class SimplePie_Category
*/
public function get_scheme()
{
- if ($this->scheme !== null)
- {
- return $this->scheme;
- }
- else
- {
- return null;
- }
+ return $this->scheme;
}
/**
* Get the human readable label
*
+ * @param bool $strict
* @return string|null
*/
- public function get_label()
+ public function get_label($strict = false)
{
- if ($this->label !== null)
- {
- return $this->label;
- }
- else
+ if ($this->label === null && $strict !== true)
{
return $this->get_term();
}
+ return $this->label;
+ }
+
+ /**
+ * Get the category type
+ *
+ * @return string|null
+ */
+ public function get_type()
+ {
+ return $this->type;
}
}
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Item.php b/vendor/simplepie/simplepie/library/SimplePie/Item.php
index 89d4bacb6..00f4179bf 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Item.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Item.php
@@ -206,9 +206,10 @@ class SimplePie_Item
*
* @since Beta 2
* @param boolean $hash Should we force using a hash instead of the supplied ID?
- * @return string
+ * @param string|false $fn User-supplied function to generate an hash
+ * @return string|null
*/
- public function get_id($hash = false, $fn = '')
+ public function get_id($hash = false, $fn = 'md5')
{
if (!$hash)
{
@@ -237,7 +238,15 @@ class SimplePie_Item
return $this->sanitize($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about'], SIMPLEPIE_CONSTRUCT_TEXT);
}
}
- if ($fn === '' || !is_callable($fn)) $fn = 'md5';
+ if ($fn === false)
+ {
+ return null;
+ }
+ elseif (!is_callable($fn))
+ {
+ trigger_error('User-supplied function $fn must be callable', E_USER_WARNING);
+ $fn = 'md5';
+ }
return call_user_func($fn,
$this->get_permalink().$this->get_title().$this->get_content());
}
@@ -460,7 +469,8 @@ class SimplePie_Item
{
$categories = array();
- foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'category') as $category)
+ $type = 'category';
+ foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, $type) as $category)
{
$term = null;
$scheme = null;
@@ -477,9 +487,9 @@ class SimplePie_Item
{
$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_HTML);
}
- $categories[] = $this->registry->create('Category', array($term, $scheme, $label));
+ $categories[] = $this->registry->create('Category', array($term, $scheme, $label, $type));
}
- foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category)
+ foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, $type) as $category)
{
// This is really the label, but keep this as the term also for BC.
// Label will also work on retrieving because that falls back to term.
@@ -492,15 +502,17 @@ class SimplePie_Item
{
$scheme = null;
}
- $categories[] = $this->registry->create('Category', array($term, $scheme, null));
+ $categories[] = $this->registry->create('Category', array($term, $scheme, null, $type));
}
- foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
+
+ $type = 'subject';
+ foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, $type) as $category)
{
- $categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_HTML), null, null));
+ $categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_HTML), null, null, $type));
}
- foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category)
+ foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, $type) as $category)
{
- $categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_HTML), null, null));
+ $categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_HTML), null, null, $type));
}
if (!empty($categories))
diff --git a/view/de/hmessages.po b/view/de/hmessages.po
index 62f7fe602..e8c16faaa 100644
--- a/view/de/hmessages.po
+++ b/view/de/hmessages.po
@@ -13751,3 +13751,19 @@ msgstr "Cron-Aufgaben laufen nicht."
#, php-format
msgid "[hubzilla] Cron tasks not running on %s"
msgstr "[hubzilla] Cron-Aufgaben für %s laufen nicht"
+
+#: ../../addon/demohub/demohub.php:41
+msgid "Welcome to the Hubzilla demo hub!"
+msgstr "Willkommen auf dem Hubzilla demo Hub!"
+
+#: ../../addon/demohub/demohub.php:42
+msgid "This demo hub is designed to give you a chance to explore some of the features offered by the Hubzilla platform. The activities of the fictional characters illustrate only a few of the ways communities can use Hubzilla to collaborate and connect."
+msgstr "Dieser demo Hub (Hubzilla-Knoten) ist konzipiert, um Ihnen eine Chance zu geben, einige Features der Hubzilla-Platform kennenzulernen. Die fiktive Aktivitäten illustrieren nur einige von vielen Möglichkeiten, die den Communities für die Kommunikation und Zusammenarbeit im Hubzilla-Netzwerk zur Verfügung stehen."
+
+#: ../../addon/demohub/demohub.php:45
+msgid "To really grasp what Hubzilla is offering in terms of nomadic identity and decentralized access control, you have to try it for yourself. Run your own hub or register on an open hub. You can always clone your channels and migrate to another hub later. With Hubzilla, you not only own your data, but your identity as well!The demo resets every ten minutes, which may interrupt your session. Simply reload the page as necessary. You can return to this dialog using the blue info button in the navbar."
+msgstr "Sie können selbst in der Praxis testen, welche Möglichkeiten Ihnen im Hubzilla-Netzwerk mit Nomadic Identity und mit dem dezentralen Zugang. Richten Sie einen eigenen Hubzilla-Knoten ein oder registrieren Sie sich auf einem offenen Hub. Sie können dann Ihren Kanal klonen oder mit diesem Kanal auf einen anderen Hub umziehen. Mit Hubzilla kontrollieren Sie Ihre Daten, aber auch Ihre Identität!
Die Demoinstanz wird im 10-Minuten-Takt zurückgesetzt, wobei Ihre Hubzilla-Sitzung evtl. unterbrochen wird. Laden Sie die Website #^https://demo.hubzilla.org/ einfach neu, um fortzufahren. Sie können dieses Dialog-Fenster mit einem Klick auf das blaue [i]-Symbol rechts oben in der Navigationsleiste."
+
+#: ../../addon/demohub/demohub.php:52
+msgid "Explore"
+msgstr "Erforschen"
\ No newline at end of file