diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/CustomWebViewClient.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/CustomWebViewClient.java index 0377f64a..b6e79c7d 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/CustomWebViewClient.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/CustomWebViewClient.java @@ -38,7 +38,7 @@ public class CustomWebViewClient extends WebViewClient { public void onPageStarted(WebView view, String url, Bitmap favicon) { super.onPageStarted(view, url, favicon); swipeRefreshLayout.setEnabled(true); - if(url.contains(app.getSettings().getPodDomain()+"/conversations/") || url.endsWith("status_messages/new")){ + if(url.contains(app.getSettings().getPodDomain()+"/conversations/") || url.endsWith("status_messages/new") || url.equals("about:blank")){ swipeRefreshLayout.setEnabled(false); } } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java b/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java index 11630106..ed608eec 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java @@ -136,7 +136,7 @@ public class Helpers { AppSettings appSettings = app.getSettings(); sb.append("»  "); sb.append(String.format(Locale.getDefault(), - "%s", + "%s", appSettings.getPodDomain(), app.getString(R.string.all_tags))); sb.append("
"); for (String tag: profile.getFollowedTags()) { diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c6162c05..520bf20a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -28,16 +28,16 @@ - D* Benachrichtigungen - D* Unterhaltungen - D* Stream - D* Profil - D* Aspekte - D* Aktivitäten - D* Gelikte Beiträge - D* Kommentiert - D* Erwähnungen - D* Öffentliche Aktivitäten + Benachrichtigungen + Unterhaltungen + Stream + Profil + Aspekte + Aktivitäten + Gelikte Beiträge + Kommentiert + Erwähnungen + Öffentliche Aktivitäten @@ -65,7 +65,7 @@ Unterhaltungen - D* Neuer Beitrag + Neuer Beitrag Benachrichtigungen Konnte Bild nicht laden … Inhalt Teilen @@ -157,5 +157,6 @@ along with this program. If not, see http://www.gnu.org/licenses.<br> <br Warnung: Proxy konnte nicht aktiviert werden… Mobil-/Desktopansicht umschalten + Alle Tags diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 13e2e3be..21ef71d3 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -13,16 +13,16 @@ - D* Notifications - D* Discussions - D* Flux - D* Profil - D* Aspects - D* Activités - D* Aimés - D* Commentés - D* Mentions - D* Public + Notifications + Discussions + Flux + Profil + Aspects + Activités + Aimés + Commentés + Mentions + Public @@ -39,7 +39,7 @@ Confirmation Voulez-vous vraiment utiliser\nhttps://%1$s\ncomme pod Diaspora ? Souhaitez-vous quitter ? - D* Nouveau message + Nouveau message Notifications Discussions @@ -155,4 +155,5 @@ Attention: connexion au proxy impossible… Partager… + Tout Tags diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 166766ba..a569d140 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -21,16 +21,16 @@ - D* Notifications - D* Conversations - D* Stream - D* Profil - D* Aspects - D* Activities - D* Liked - D* Commented - D* Mentions - D* Public + Notifications + Conversations + Stream + Profil + Aspects + Activities + Liked + Commented + Mentions + Public @@ -47,7 +47,7 @@ Confirmation Do you really want to use\nhttps://%1$s\nas your Diaspora Pod? Do you want to exit? - D* New message + New message Notifications Conversations