Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

About menu contribution fixes.

Browse Source
This commit is contained in:
FlyingP1g FlyingP1g
2022-07-12 17:07:28 +03:00
parent f7dde1250c
commit 57bd5789d4
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java
View File

@@ -15,7 +15,6 @@ import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
import org.briarproject.briar.BuildConfig; import org.briarproject.briar.BuildConfig;
import org.briarproject.briar.R; import org.briarproject.briar.R;
import java.util.Locale;
import java.util.logging.Logger; import java.util.logging.Logger;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@@ -26,6 +25,7 @@ import static android.widget.Toast.LENGTH_LONG;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static java.util.logging.Logger.getLogger; import static java.util.logging.Logger.getLogger;
import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.logException;
import static java.util.Locale.*;
@MethodsNotNullByDefault @MethodsNotNullByDefault
@ParametersNotNullByDefault @ParametersNotNullByDefault
@@ -82,8 +82,8 @@ public class AboutFragment extends Fragment {
R.string.error_start_activity, LENGTH_LONG).show(); R.string.error_start_activity, LENGTH_LONG).show();
} }
}); });
if (!Locale.getDefault().getLanguage() if (!getDefault().getLanguage()
.equals(Locale.ENGLISH.toString())) { .equals(ENGLISH.toString())) {
translatedBy.setVisibility(View.VISIBLE); translatedBy.setVisibility(View.VISIBLE);
translatedBy.setText(getString( translatedBy.setText(getString(
R.string.translated_by, R.string.translated_by,

14
briar-android/src/main/res/layout/fragment_about.xml
View File

@@ -18,9 +18,9 @@
android:id="@+id/LinksTitle" android:id="@+id/LinksTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/links" android:text="@string/links"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:layout_marginTop="16dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/BriarVersion" /> app:layout_constraintTop_toBottomOf="@+id/BriarVersion" />
@@ -49,8 +49,18 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="@string/translated_by" android:text="@string/translated_by"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:visibility="invisible" android:visibility="gone"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/BriarSourceCode" /> app:layout_constraintTop_toBottomOf="@+id/BriarSourceCode" />
<TextView
android:id="@+id/TranslatorThanks"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/translator_thanks"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/TranslatedBy" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

3
briar-android/src/main/res/values/strings.xml
View File

@@ -698,7 +698,8 @@
<string name="briar_website">\u2022 <a href="">Briar website</a></string> <string name="briar_website">\u2022 <a href="">Briar website</a></string>
<string name="briar_source_code">\u2022 <a href="">Briar source code</a></string> <string name="briar_source_code">\u2022 <a href="">Briar source code</a></string>
<string name="translated_by">Translated by: %s</string> <string name="translated_by">Translated by: %s</string>
<string name="translator_name">Your name</string> <string name="translator_name">Your name</string> <!-- Here translators can add their names or Transifex usernames -->
<string name="translator_thanks">Thanks to all the unlisted contributors in the Localisation Lab</string>
<!-- Conversation Settings --> <!-- Conversation Settings -->
<string name="disappearing_messages_title">Disappearing messages</string> <string name="disappearing_messages_title">Disappearing messages</string>