From f800b09f3bedc80117c86c180d79f6476bf26222 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 19 Jul 2015 12:28:29 +0200 Subject: [PATCH 1/4] DE update for the translations of curweather and irc addons --- curweather/lang/de/messages.po | 124 ++++++++++++++++++++++++++++----- irc/lang/de/messages.po | 49 +++++++++---- irc/lang/de/strings.php | 5 +- 3 files changed, 144 insertions(+), 34 deletions(-) diff --git a/curweather/lang/de/messages.po b/curweather/lang/de/messages.po index 3b0fbde4..4aa5782d 100644 --- a/curweather/lang/de/messages.po +++ b/curweather/lang/de/messages.po @@ -5,41 +5,129 @@ # # Translators: # Abrax , 2014 -# bavatar , 2014 +# bavatar , 2014-2015 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-27 05:01-0500\n" -"PO-Revision-Date: 2014-10-15 12:18+0000\n" -"Last-Translator: Abrax \n" -"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" +"POT-Creation-Date: 2015-07-13 18:46+0200\n" +"PO-Revision-Date: 2015-07-19 10:07+0000\n" +"Last-Translator: bavatar \n" +"Language-Team: German (http://www.transifex.com/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: curweather.php:46 +#: curweather.php:30 +msgid "Error fetching weather data.\\nError was: " +msgstr "Fehler beim abrufen der Wetterdaten.\\nDie Fehlermeldung lautet:" + +#: curweather.php:103 curweather.php:163 msgid "Current Weather" msgstr "Aktuelles Wetter" -#: curweather.php:67 +#: curweather.php:109 +msgid "Relative Humidity" +msgstr "Relative Luftfeuchtigkeit" + +#: curweather.php:110 +msgid "Pressure" +msgstr "Luftdruck" + +#: curweather.php:111 +msgid "Wind" +msgstr "Wind" + +#: curweather.php:112 +msgid "Last Updated" +msgstr "Letzte Aktualisierung" + +#: curweather.php:113 +msgid "Data by" +msgstr "Daten von" + +#: curweather.php:114 +msgid "Show on map" +msgstr "Karte anzeigen" + +#: curweather.php:119 +msgid "There was a problem accessing the weather data. But have a look" +msgstr "Es gab ein Problem beim Abrufen der Wetterdaten. Aber werf doch mal einen Blick" + +#: curweather.php:121 +msgid "at OpenWeatherMap" +msgstr "auf OpenWeatherMap" + +#: curweather.php:137 msgid "Current Weather settings updated." msgstr "Einstellungen des Aktuellen Wetter Addons aktualisiert." -#: curweather.php:90 -msgid "Current Weather Settings" +#: curweather.php:152 +msgid "No APPID found, please contact your admin to optain one." +msgstr "Keine APPID gefunden, bitte kontaktiere deinen Admin damit eine eingerichtet wird." + +#: curweather.php:162 curweather.php:191 +msgid "Save Settings" +msgstr "Einstellungen speichern" + +#: curweather.php:163 +msgid "Settings" msgstr "Einstellungen" -#: curweather.php:93 -msgid "Weather Location: " -msgstr "Wetter Standort" +#: curweather.php:165 +msgid "Enter either the name of your location or the zip code." +msgstr "Gib entweder den Namen oder die PLZ deines Ortes ein." -#: curweather.php:96 -msgid "Enable Current Weather" -msgstr "Aktuelles Wetter aktivieren" +#: curweather.php:166 +msgid "Your Location" +msgstr "Deinen Standort festlegen" -#: curweather.php:104 -msgid "Submit" -msgstr "Senden" +#: curweather.php:166 +msgid "" +"Identifier of your location (name or zip code), e.g. Berlin,DE or " +"14476,DE." +msgstr "Identifikator deines Standorts (Name oder Postleitzahl), z.B. Berlin,DE oder 14476,DE." + +#: curweather.php:167 +msgid "Units" +msgstr "Einheiten" + +#: curweather.php:167 +msgid "select if the temperatur should be displayed in °C or °F" +msgstr "wähle ob die Temperatur in °C oder °F angezeigt werden soll" + +#: curweather.php:168 +msgid "Show weather data" +msgstr "Zeige Wetter Daten" + +#: curweather.php:181 +msgid "Curweather settings saved." +msgstr "Curweather Einstellungen gespeichert." + +#: curweather.php:192 +msgid "Caching Interval" +msgstr "Cache Intervall" + +#: curweather.php:192 +msgid "" +"For how long should the weather data be cached? Choose according your " +"OpenWeatherMap account type." +msgstr "Wie lange sollen die Wetter Daten gecached werden? Wähle einen für deinen OpenWeatherMap Account passende Einstellung." + +#: curweather.php:192 +msgid "no cache" +msgstr "kein Cache" + +#: curweather.php:192 +msgid "minutes" +msgstr "Minuten" + +#: curweather.php:193 +msgid "Your APPID" +msgstr "Deine APPID" + +#: curweather.php:193 +msgid "Your API key provided by OpenWeatherMap" +msgstr "Der API Schlüssel von OpenWeatherMap" diff --git a/irc/lang/de/messages.po b/irc/lang/de/messages.po index 50f52fab..3ab048b9 100644 --- a/irc/lang/de/messages.po +++ b/irc/lang/de/messages.po @@ -4,46 +4,65 @@ # # # Translators: -# Abrax , 2014 -# bavatar , 2014 +# Abrax , 2014-2015 +# bavatar , 2014-2015 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-27 05:01-0500\n" -"PO-Revision-Date: 2014-10-15 12:30+0000\n" -"Last-Translator: Abrax \n" -"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" +"POT-Creation-Date: 2015-07-08 13:17+0200\n" +"PO-Revision-Date: 2015-07-19 10:11+0000\n" +"Last-Translator: bavatar \n" +"Language-Team: German (http://www.transifex.com/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: irc.php:44 +#: irc.php:37 msgid "IRC Settings" msgstr "IRC Einstellungen" -#: irc.php:46 +#: irc.php:38 +msgid "" +"Here you can change the system wide settings for the channels to " +"automatically join and access via the side bar. Note the changes you do " +"here, only effect the channel selection if you are logged in." +msgstr "Hier könne die systemweiten Einstellungen für beliebte Kanäle und solche die automatisch betreten werden sollen festgelegt werden. Achtung: Die Einstellungen die her getroffen werden können von eingeloggten Nutzern für sich überschrieben werden." + +#: irc.php:39 irc.php:136 +msgid "Save Settings" +msgstr "Einstellungen speichern" + +#: irc.php:40 irc.php:137 msgid "Channel(s) to auto connect (comma separated)" msgstr "mit diesen Kanälen soll man automatisch verbunden werden (Komma getrennt)" -#: irc.php:51 +#: irc.php:40 irc.php:137 +msgid "" +"List of channels that shall automatically connected to when the app is " +"launched." +msgstr "Liste von Chaträumen die automatisch betreten werden sollen wenn die App gestartet wurde." + +#: irc.php:41 irc.php:138 msgid "Popular Channels (comma separated)" msgstr "Beliebte Kanäle (mit Komma getrennt)" -#: irc.php:55 -msgid "Submit" -msgstr "Senden" +#: irc.php:41 irc.php:138 +msgid "" +"List of popular channels, will be displayed at the side and hotlinked for " +"easy joining." +msgstr "Liste populärer Chaträume die vverlinkt am Seitenrand aufgelistet werden zum schnelleren betreten." -#: irc.php:69 +#: irc.php:57 irc.php:128 msgid "IRC settings saved." msgstr "IRC Einstellungen gespeichert." -#: irc.php:74 +#: irc.php:62 msgid "IRC Chatroom" msgstr "IRC Chatraum" -#: irc.php:96 +#: irc.php:90 msgid "Popular Channels" msgstr "Beliebte Räume" diff --git a/irc/lang/de/strings.php b/irc/lang/de/strings.php index f611d361..cb1ba7c4 100644 --- a/irc/lang/de/strings.php +++ b/irc/lang/de/strings.php @@ -6,9 +6,12 @@ function string_plural_select_de($n){ }} ; $a->strings["IRC Settings"] = "IRC Einstellungen"; +$a->strings["Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in."] = "Hier könne die systemweiten Einstellungen für beliebte Kanäle und solche die automatisch betreten werden sollen festgelegt werden. Achtung: Die Einstellungen die her getroffen werden können von eingeloggten Nutzern für sich überschrieben werden."; +$a->strings["Save Settings"] = "Einstellungen speichern"; $a->strings["Channel(s) to auto connect (comma separated)"] = "mit diesen Kanälen soll man automatisch verbunden werden (Komma getrennt)"; +$a->strings["List of channels that shall automatically connected to when the app is launched."] = "Liste von Chaträumen die automatisch betreten werden sollen wenn die App gestartet wurde."; $a->strings["Popular Channels (comma separated)"] = "Beliebte Kanäle (mit Komma getrennt)"; -$a->strings["Submit"] = "Senden"; +$a->strings["List of popular channels, will be displayed at the side and hotlinked for easy joining."] = "Liste populärer Chaträume die vverlinkt am Seitenrand aufgelistet werden zum schnelleren betreten."; $a->strings["IRC settings saved."] = "IRC Einstellungen gespeichert."; $a->strings["IRC Chatroom"] = "IRC Chatraum"; $a->strings["Popular Channels"] = "Beliebte Räume"; -- 2.45.2 From ca7d448aa568aaa8d9a7abdd3acf4367f015c735 Mon Sep 17 00:00:00 2001 From: Johannes Schwab Date: Sat, 18 Jul 2015 11:03:58 +0200 Subject: [PATCH 2/4] skip duplicate posts when importing hometimeline --- twitter/twitter.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/twitter/twitter.php b/twitter/twitter.php index c87f4a01..41bfdaa7 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -1548,9 +1548,15 @@ function twitter_fetchhometimeline($a, $uid) { $otoken = get_pconfig($uid, 'twitter', 'oauthtoken'); $osecret = get_pconfig($uid, 'twitter', 'oauthsecret'); $create_user = get_pconfig($uid, 'twitter', 'create_user'); + $mirror_posts = get_pconfig($uid, 'twitter', 'mirror_posts'); logger("twitter_fetchhometimeline: Fetching for user ".$uid, LOGGER_DEBUG); + $application_name = get_config('twitter', 'application_name'); + + if ($application_name == "") + $application_name = $a->get_hostname(); + require_once('library/twitteroauth.php'); require_once('include/items.php'); @@ -1617,6 +1623,16 @@ function twitter_fetchhometimeline($a, $uid) { if ($first_time) continue; + if (stristr($post->source, $application_name) && $post->user->screen_name == $own_id) { + logger("twitter_fetchhometimeline: Skip previously sended post for user ".$uid, LOGGER_DEBUG); + continue; + } + + if ($mirror_posts && $post->user->screen_name == $own_id && $post->in_reply_to_status_id_str == "") { + logger("twitter_fetchhometimeline: Skip post that will be mirrored for user ".$uid, LOGGER_DEBUG); + continue; + } + $postarray = twitter_createpost($a, $uid, $post, $self, $create_user, true); if (trim($postarray['body']) == "") -- 2.45.2 From 86fcb99536be96132cb384a3d741b75f04f5a42a Mon Sep 17 00:00:00 2001 From: Johannes Schwab Date: Sat, 18 Jul 2015 23:46:27 +0200 Subject: [PATCH 3/4] fetch parent posts --- twitter/twitter.php | 58 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index 41bfdaa7..916e3724 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -1542,6 +1542,54 @@ function twitter_checknotification($a, $uid, $own_id, $top_item, $postarray) { } } +function twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id) { + logger("twitter_fetchparentposts: Fetching for user ".$uid." and post ".$post->id_str, LOGGER_DEBUG); + + $posts = array(); + + while ($post->in_reply_to_status_id_str != "") { + $parameters = array("trim_user" => false, "id" => $post->in_reply_to_status_id_str); + + $post = $connection->get('statuses/show', $parameters); + + if (!count($post)) { + logger("twitter_fetchparentposts: Can't fetch post ".$parameters->id, LOGGER_DEBUG); + break; + } + + $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc("twitter::".$post->id_str), + intval($uid) + ); + + if (count($r)) + break; + + $posts[] = $post; + } + + logger("twitter_fetchparentposts: Fetching ".count($posts)." parents", LOGGER_DEBUG); + + $posts = array_reverse($posts); + + if (count($posts)) { + foreach ($posts as $post) { + $postarray = twitter_createpost($a, $uid, $post, $self, false, false); + + if (trim($postarray['body']) == "") + continue; + + $item = item_store($postarray); + $postarray["id"] = $item; + + logger('twitter_fetchparentpost: User '.$self["nick"].' posted parent timeline item '.$item); + + if ($item != 0) + twitter_checknotification($a, $uid, $own_id, $item, $postarray); + } + } +} + function twitter_fetchhometimeline($a, $uid) { $ckey = get_config('twitter', 'consumerkey'); $csecret = get_config('twitter', 'consumersecret'); @@ -1624,15 +1672,18 @@ function twitter_fetchhometimeline($a, $uid) { continue; if (stristr($post->source, $application_name) && $post->user->screen_name == $own_id) { - logger("twitter_fetchhometimeline: Skip previously sended post for user ".$uid, LOGGER_DEBUG); + logger("twitter_fetchhometimeline: Skip previously sended post", LOGGER_DEBUG); continue; } if ($mirror_posts && $post->user->screen_name == $own_id && $post->in_reply_to_status_id_str == "") { - logger("twitter_fetchhometimeline: Skip post that will be mirrored for user ".$uid, LOGGER_DEBUG); + logger("twitter_fetchhometimeline: Skip post that will be mirrored", LOGGER_DEBUG); continue; } + if ($post->in_reply_to_status_id_str != "") + twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id); + $postarray = twitter_createpost($a, $uid, $post, $self, $create_user, true); if (trim($postarray['body']) == "") @@ -1677,6 +1728,9 @@ function twitter_fetchhometimeline($a, $uid) { if ($first_time) continue; + if ($post->in_reply_to_status_id_str != "") + twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id); + $postarray = twitter_createpost($a, $uid, $post, $self, false, false); if (trim($postarray['body']) == "") -- 2.45.2 From 9f0fc2e46d94a1e95a76da6b1086d6bd74e32d82 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 23 Jul 2015 17:38:49 +0200 Subject: [PATCH 4/4] DE curweather addon, forgot the strings.php --- curweather/lang/de/strings.php | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/curweather/lang/de/strings.php b/curweather/lang/de/strings.php index 84f9afa9..be177e7a 100644 --- a/curweather/lang/de/strings.php +++ b/curweather/lang/de/strings.php @@ -5,9 +5,30 @@ function string_plural_select_de($n){ return ($n != 1);; }} ; +$a->strings["Error fetching weather data.\\nError was: "] = "Fehler beim abrufen der Wetterdaten.\\nDie Fehlermeldung lautet:"; $a->strings["Current Weather"] = "Aktuelles Wetter"; +$a->strings["Relative Humidity"] = "Relative Luftfeuchtigkeit"; +$a->strings["Pressure"] = "Luftdruck"; +$a->strings["Wind"] = "Wind"; +$a->strings["Last Updated"] = "Letzte Aktualisierung"; +$a->strings["Data by"] = "Daten von"; +$a->strings["Show on map"] = "Karte anzeigen"; +$a->strings["There was a problem accessing the weather data. But have a look"] = "Es gab ein Problem beim Abrufen der Wetterdaten. Aber werf doch mal einen Blick"; +$a->strings["at OpenWeatherMap"] = "auf OpenWeatherMap"; $a->strings["Current Weather settings updated."] = "Einstellungen des Aktuellen Wetter Addons aktualisiert."; -$a->strings["Current Weather Settings"] = "Einstellungen"; -$a->strings["Weather Location: "] = "Wetter Standort"; -$a->strings["Enable Current Weather"] = "Aktuelles Wetter aktivieren"; -$a->strings["Submit"] = "Senden"; +$a->strings["No APPID found, please contact your admin to optain one."] = "Keine APPID gefunden, bitte kontaktiere deinen Admin damit eine eingerichtet wird."; +$a->strings["Save Settings"] = "Einstellungen speichern"; +$a->strings["Settings"] = "Einstellungen"; +$a->strings["Enter either the name of your location or the zip code."] = "Gib entweder den Namen oder die PLZ deines Ortes ein."; +$a->strings["Your Location"] = "Deinen Standort festlegen"; +$a->strings["Identifier of your location (name or zip code), e.g. Berlin,DE or 14476,DE."] = "Identifikator deines Standorts (Name oder Postleitzahl), z.B. Berlin,DE oder 14476,DE."; +$a->strings["Units"] = "Einheiten"; +$a->strings["select if the temperatur should be displayed in °C or °F"] = "wähle ob die Temperatur in °C oder °F angezeigt werden soll"; +$a->strings["Show weather data"] = "Zeige Wetter Daten"; +$a->strings["Curweather settings saved."] = "Curweather Einstellungen gespeichert."; +$a->strings["Caching Interval"] = "Cache Intervall"; +$a->strings["For how long should the weather data be cached? Choose according your OpenWeatherMap account type."] = "Wie lange sollen die Wetter Daten gecached werden? Wähle einen für deinen OpenWeatherMap Account passende Einstellung."; +$a->strings["no cache"] = "kein Cache"; +$a->strings["minutes"] = "Minuten"; +$a->strings["Your APPID"] = "Deine APPID"; +$a->strings["Your API key provided by OpenWeatherMap"] = "Der API Schlüssel von OpenWeatherMap"; -- 2.45.2