diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java index e886c633d..a21527474 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java @@ -314,6 +314,9 @@ public class TootActivity extends BaseActivity implements OnPostActionInterface, toot_emoji.setVisibility(View.GONE); } + if(MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU ) { + toot_it.setText(getText(R.string.queet_it)); + } drawer_layout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { @@ -394,10 +397,19 @@ public class TootActivity extends BaseActivity implements OnPostActionInterface, if( tootReply != null) { tootReply(); }else { - if( title != null) - title.setText(getString(R.string.toot_title)); - else - setTitle(R.string.toot_title); + if( title != null) { + if(MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU) + title.setText(getString(R.string.queet_title)); + else + title.setText(getString(R.string.toot_title)); + + } + else { + if(MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU) + setTitle(R.string.queet_title); + else + setTitle(R.string.toot_title); + } } @@ -2262,10 +2274,18 @@ public class TootActivity extends BaseActivity implements OnPostActionInterface, tootReply(); }else { - if( title != null) - title.setText(getString(R.string.toot_title)); - else - setTitle(R.string.toot_title); + if( title != null){ + if(MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU) + title.setText(getString(R.string.queet_title)); + else + title.setText(getString(R.string.toot_title)); + } + else { + if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU) + setTitle(R.string.queet_title); + else + setTitle(R.string.toot_title); + } } invalidateOptionsMenu(); initialContent = toot_content.getText().toString(); @@ -2397,10 +2417,18 @@ public class TootActivity extends BaseActivity implements OnPostActionInterface, break; } - if( title != null) - title.setText(getString(R.string.toot_title)); - else - setTitle(R.string.toot_title); + if( title != null) { + if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU) + title.setText(getString(R.string.queet_title)); + else + title.setText(getString(R.string.toot_title)); + } + else { + if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU) + setTitle(R.string.queet_title); + else + setTitle(R.string.toot_title); + } invalidateOptionsMenu(); initialContent = toot_content.getText().toString(); toot_space_left.setText(String.valueOf(toot_content.getText().length() + toot_cw_content.getText().length())); @@ -2408,10 +2436,18 @@ public class TootActivity extends BaseActivity implements OnPostActionInterface, private void tootReply(){ SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE); - if( title != null) - title.setText(getString(R.string.toot_title_reply)); - else - setTitle(R.string.toot_title_reply); + if( title != null) { + if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU) + title.setText(getString(R.string.queet_title_reply)); + else + title.setText(getString(R.string.toot_title_reply)); + } + else { + if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU) + setTitle(R.string.queet_title_reply); + else + setTitle(R.string.toot_title_reply); + } String userIdReply; if( accountReply == null) userIdReply = sharedpreferences.getString(Helper.PREF_KEY_ID, null); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7c44d58e3..bdb59f866 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -71,6 +71,7 @@ Open in browser Translate Please, wait few seconds before making this action. + Queets Home Local timeline @@ -165,9 +166,12 @@ Warning What is on your mind? TOOT! + QUEET! cw Write a toot Reply to a toot + Write a queet + Reply to a queet You have reached the 500 characters allowed! Select a media An error occurred while selecting the media!