diff --git a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
index c5642a6c..e054ba6e 100644
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@@ -8,6 +8,7 @@ import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.notifications.Notifications;
+import java.util.Locale;
 
 /**
  * Author M M Arif
@@ -77,7 +78,13 @@ public abstract class BaseActivity extends AppCompatActivity {
 
 		}
 
-		AppUtil.setAppLocale(getResources(), tinyDB.getString("locale"));
+		String locale = tinyDB.getString("locale");
+		if (locale.isEmpty()) {
+			AppUtil.setAppLocale(getResources(), Locale.getDefault().getLanguage());
+		}
+		else {
+			AppUtil.setAppLocale(getResources(), locale);
+		}
 
 		Notifications.startWorker(appCtx);
 	}
diff --git a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
index 3760ab8a..2deae15a 100644
--- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
@@ -569,7 +569,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 					}
 
 					TinyDB tinyDb = TinyDB.getInstance(appCtx);
-					final String locale = tinyDb.getString("locale");
+					final String locale = getResources().getConfiguration().locale.getLanguage();
 					final String timeFormat = tinyDb.getString("dateFormat");
 					tinyDb.putString("issueState", singleIssue.getState());
 					tinyDb.putString("issueTitle", singleIssue.getTitle());
diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java
index 45b3e8ac..8a40543d 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java
@@ -11,6 +11,9 @@ import androidx.appcompat.app.AlertDialog;
 import org.mian.gitnex.R;
 import org.mian.gitnex.databinding.ActivitySettingsTranslationBinding;
 import org.mian.gitnex.helpers.Toasty;
+import java.util.LinkedHashMap;
+import java.util.Locale;
+import java.util.TreeMap;
 
 /**
  * Author M M Arif
@@ -20,8 +23,6 @@ public class SettingsTranslationActivity extends BaseActivity {
 
 	private View.OnClickListener onClickListener;
 
-	private static String[] langList = {"English", "Arabic", "Chinese", "Czech", "Finnish", "French", "German", "Italian", "Latvian", "Persian",
-		"Polish", "Portuguese/Brazilian", "Russian", "Serbian", "Spanish", "Turkish", "Ukrainian"};
 	private static int langSelectedChoice = 0;
 
 	@Override
@@ -29,6 +30,12 @@ public class SettingsTranslationActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 
+		LinkedHashMap<String, String> langs = new LinkedHashMap<>();
+		langs.put("", getString(R.string.settingsLanguageSystem));
+		for(String langCode : getResources().getStringArray(R.array.languages)) {
+			langs.put(langCode, getLanguageDisplayName(langCode));
+		}
+
 		ActivitySettingsTranslationBinding activitySettingsTranslationBinding = ActivitySettingsTranslationBinding.inflate(getLayoutInflater());
 		setContentView(activitySettingsTranslationBinding.getRoot());
 
@@ -52,15 +59,9 @@ public class SettingsTranslationActivity extends BaseActivity {
 
 		});
 
-		if(!tinyDB.getString("localeStr").isEmpty()) {
+		tvLanguageSelected.setText(tinyDB.getString("localeStr"));
 
-			tvLanguageSelected.setText(tinyDB.getString("localeStr"));
-		}
-
-		if(langSelectedChoice == 0) {
-
-			langSelectedChoice = tinyDB.getInt("langId");
-		}
+		langSelectedChoice = tinyDB.getInt("langId");
 
 		// language dialog
 		langFrame.setOnClickListener(view -> {
@@ -70,89 +71,18 @@ public class SettingsTranslationActivity extends BaseActivity {
 			lBuilder.setTitle(R.string.settingsLanguageSelectorDialogTitle);
 			lBuilder.setCancelable(langSelectedChoice != -1);
 
-			lBuilder.setSingleChoiceItems(langList, langSelectedChoice, (dialogInterface, i) -> {
+			lBuilder.setSingleChoiceItems(langs.values().toArray(new String[0]), langSelectedChoice, (dialogInterface, i) -> {
 
-				langSelectedChoice = i;
-				tvLanguageSelected.setText(langList[i]);
-				tinyDB.putString("localeStr", langList[i]);
+				String selectedLanguage = langs.keySet().toArray(new String[0])[i];
+				tinyDB.putString("localeStr", langs.get(selectedLanguage));
 				tinyDB.putInt("langId", i);
-
-				switch(langList[i]) {
-					case "Arabic":
-
-						tinyDB.putString("locale", "ar");
-						break;
-					case "Chinese":
-
-						tinyDB.putString("locale", "zh");
-						break;
-					case "Czech":
-
-						tinyDB.putString("locale", "cs");
-						break;
-					case "Finnish":
-
-						tinyDB.putString("locale", "fi");
-						break;
-					case "French":
-
-						tinyDB.putString("locale", "fr");
-						break;
-					case "German":
-
-						tinyDB.putString("locale", "de");
-						break;
-					case "Italian":
-
-						tinyDB.putString("locale", "it");
-						break;
-					case "Latvian":
-
-						tinyDB.putString("locale", "lv");
-						break;
-					case "Persian":
-
-						tinyDB.putString("locale", "fa");
-						break;
-					case "Polish":
-
-						tinyDB.putString("locale", "pl");
-						break;
-					case "Portuguese/Brazilian":
-
-						tinyDB.putString("locale", "pt");
-						break;
-					case "Russian":
-
-						tinyDB.putString("locale", "ru");
-						break;
-					case "Serbian":
-
-						tinyDB.putString("locale", "sr");
-						break;
-					case "Spanish":
-
-						tinyDB.putString("locale", "es");
-						break;
-					case "Turkish":
-
-						tinyDB.putString("locale", "tr");
-						break;
-					case "Ukrainian":
-
-						tinyDB.putString("locale", "uk");
-						break;
-					default:
-
-						tinyDB.putString("locale", "en");
-						break;
-				}
+				tinyDB.putString("locale", selectedLanguage);
 
 				tinyDB.putBoolean("refreshParent", true);
-				this.recreate();
 				this.overridePendingTransition(0, 0);
 				dialogInterface.dismiss();
 				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+				this.recreate();
 			});
 
 			lBuilder.setNeutralButton(getString(R.string.cancelButton), null);
@@ -167,4 +97,10 @@ public class SettingsTranslationActivity extends BaseActivity {
 		onClickListener = view -> finish();
 	}
 
+	private static String getLanguageDisplayName(String langCode) {
+		Locale english = new Locale("en");
+		Locale translated = new Locale(langCode);
+		return String.format("%s (%s)", translated.getDisplayName(translated), translated.getDisplayName(english));
+	}
+
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/AdminCronTasksAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/AdminCronTasksAdapter.java
index cb53bff4..c8be42c4 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/AdminCronTasksAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/AdminCronTasksAdapter.java
@@ -44,7 +44,7 @@ public class AdminCronTasksAdapter extends RecyclerView.Adapter<AdminCronTasksAd
 			super(itemView);
 			Context ctx = itemView.getContext();
 
-			final String locale = tinyDb.getString("locale");
+			final String locale = ctx.getResources().getConfiguration().locale.getLanguage();
 			final String timeFormat = tinyDb.getString("dateFormat");
 
 			ImageView runTask = itemView.findViewById(R.id.runTask);
diff --git a/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
index b1729892..f00d05bb 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
@@ -106,7 +106,7 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
         void bindData(Commits commitsModel) {
 
             final TinyDB tinyDb = TinyDB.getInstance(context);
-            final String locale = tinyDb.getString("locale");
+	        String locale = context.getResources().getConfiguration().locale.getLanguage();
             final String timeFormat = tinyDb.getString("dateFormat");
 
             commitTitle.setText(EmojiParser.parseToUnicode(commitsModel.getCommit().getMessage()));
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
index ee9b5926..fd57dd01 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
@@ -183,7 +183,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 		UserRepositories currentItem = reposList.get(position);
 		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
-		String locale = tinyDb.getString("locale");
+		Locale locale = context.getResources().getConfiguration().locale;
 		String timeFormat = tinyDb.getString("dateFormat");
 		holder.userRepositories = currentItem;
 		holder.orgName.setText(currentItem.getFullName().split("/")[0]);
@@ -212,20 +212,20 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 
 			switch(timeFormat) {
 				case "pretty": {
-					PrettyTime prettyTime = new PrettyTime(new Locale(locale));
+					PrettyTime prettyTime = new PrettyTime(locale);
 					String createdTime = prettyTime.format(currentItem.getUpdated_at());
 					holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
 					holder.repoLastUpdated.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getUpdated_at()), context));
 					break;
 				}
 				case "normal": {
-					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
 					String createdTime = formatter.format(currentItem.getUpdated_at());
 					holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
 					break;
 				}
 				case "normal1": {
-					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
 					String createdTime = formatter.format(currentItem.getUpdated_at());
 					holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
 					break;
diff --git a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
index 8c078d30..a8dccb58 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
@@ -338,13 +338,13 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 			if(timeFormat.equals("pretty")) {
 
-				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreated_at(), Locale.getDefault(), "pretty", context));
+				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreated_at(), context.getResources().getConfiguration().locale, "pretty", context));
 				holder.information.setOnClickListener(v -> TimeHelper.customDateFormatForToastDateFormat(issueComment.getCreated_at()));
 
 			}
 			else if(timeFormat.equals("normal")) {
 
-				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreated_at(), Locale.getDefault(), "normal", context));
+				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreated_at(), context.getResources().getConfiguration().locale, "normal", context));
 			}
 
 			if(!issueComment.getCreated_at().equals(issueComment.getUpdated_at())) {
diff --git a/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
index 4a53a42c..6931df10 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
@@ -135,7 +135,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 		void bindData(Issues issue) {
 
 			TinyDB tinyDb = TinyDB.getInstance(context);
-			String locale = tinyDb.getString("locale");
+			String locale = context.getResources().getConfiguration().locale.getLanguage();
 			String timeFormat = tinyDb.getString("dateFormat");
 
 			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
diff --git a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
index f805e570..6c5f4a96 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
@@ -148,7 +148,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
 			this.milestones = dataModel;
 			final TinyDB tinyDb = TinyDB.getInstance(context);
-			final String locale = tinyDb.getString("locale");
+			final String locale = context.getResources().getConfiguration().locale.getLanguage();
 			final String timeFormat = tinyDb.getString("dateFormat");
 
 			Markdown.render(context, dataModel.getTitle(), msTitle);
diff --git a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
index b779b85d..78902648 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
@@ -190,7 +190,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 		UserRepositories currentItem = reposList.get(position);
 		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
-		String locale = tinyDb.getString("locale");
+		String locale = context.getResources().getConfiguration().locale.getLanguage();
 		String timeFormat = tinyDb.getString("dateFormat");
 		holder.userRepositories = currentItem;
 		holder.orgName.setText(currentItem.getFullName().split("/")[0]);
diff --git a/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
index 2fcb2a61..a7d523c1 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
@@ -147,7 +147,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 		void bindData(PullRequests pullRequest) {
 
 			TinyDB tinyDb = TinyDB.getInstance(context);
-			String locale = tinyDb.getString("locale");
+			String locale = context.getResources().getConfiguration().locale.getLanguage();
 			String timeFormat = tinyDb.getString("dateFormat");
 			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
index 03ea3a70..f9fd4690 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
@@ -89,7 +89,7 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
     public void onBindViewHolder(@NonNull ReleasesAdapter.ReleasesViewHolder holder, int position) {
 
         final TinyDB tinyDb = TinyDB.getInstance(context);
-	    final String locale = tinyDb.getString("locale");
+	    final String locale = context.getResources().getConfiguration().locale.getLanguage();
 	    final String timeFormat = tinyDb.getString("dateFormat");
 	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoForksAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoForksAdapter.java
index 78129efb..e41ff9a4 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoForksAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoForksAdapter.java
@@ -132,7 +132,7 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 			TinyDB tinyDb = TinyDB.getInstance(context);
 			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
-			String locale = tinyDb.getString("locale");
+			String locale = context.getResources().getConfiguration().locale.getLanguage();
 			String timeFormat = tinyDb.getString("dateFormat");
 			this.userRepositories = forksModel;
 			orgName.setText(forksModel.getFullName().split("/")[0]);
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
index fdef9dfd..ddfc7a6a 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
@@ -189,7 +189,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 		UserRepositories currentItem = reposList.get(position);
 		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
-		String locale = tinyDb.getString("locale");
+		String locale = context.getResources().getConfiguration().locale.getLanguage();
 		String timeFormat = tinyDb.getString("dateFormat");
 		holder.userRepositories = currentItem;
 		holder.orgName.setText(currentItem.getFullName().split("/")[0]);
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
index 2f6fd070..769758af 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
@@ -186,7 +186,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
 	    UserRepositories currentItem = reposList.get(position);
 	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
-	    String locale = tinyDb.getString("locale");
+	    String locale = context.getResources().getConfiguration().locale.getLanguage();
 	    String timeFormat = tinyDb.getString("dateFormat");
 	    holder.userRepositories = currentItem;
 	    holder.orgName.setText(currentItem.getFullName().split("/")[0]);
diff --git a/app/src/main/java/org/mian/gitnex/adapters/SearchIssuesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/SearchIssuesAdapter.java
index 13f4c13e..b827dbcb 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/SearchIssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/SearchIssuesAdapter.java
@@ -125,7 +125,7 @@ public class SearchIssuesAdapter extends RecyclerView.Adapter<SearchIssuesAdapte
 		Issues currentItem = searchedList.get(position);
 		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
-		String locale = tinyDb.getString("locale");
+		String locale = context.getResources().getConfiguration().locale.getLanguage();
 		String timeFormat = tinyDb.getString("dateFormat");
 
 		PicassoService.getInstance(context).get()
diff --git a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
index f7ca76f4..882b88f7 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
@@ -187,7 +187,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
 	    UserRepositories currentItem = reposList.get(position);
 	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
-	    String locale = tinyDb.getString("locale");
+	    String locale = context.getResources().getConfiguration().locale.getLanguage();
 	    String timeFormat = tinyDb.getString("dateFormat");
 	    holder.userRepositories = currentItem;
 	    holder.orgName.setText(currentItem.getFullName().split("/")[0]);
diff --git a/app/src/main/java/org/mian/gitnex/core/MainApplication.java b/app/src/main/java/org/mian/gitnex/core/MainApplication.java
index cb921174..23250edc 100644
--- a/app/src/main/java/org/mian/gitnex/core/MainApplication.java
+++ b/app/src/main/java/org/mian/gitnex/core/MainApplication.java
@@ -152,5 +152,10 @@ public class MainApplication extends Application {
 			tinyDB.putInt("homeScreenId", 0);
 		}
 
+		if(tinyDB.getString("localeStr").isEmpty()) {
+			tinyDB.putString("localeStr", getString(R.string.settingsLanguageSystem));
+			tinyDB.putInt("langId", 0);
+		}
+
 	}
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
index 8d824157..3f14691d 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
@@ -84,7 +84,7 @@ public class RepoInfoFragment extends Fragment {
 
 		binding.repoMetaFrame.setVisibility(View.GONE);
 
-		getRepoInfo(Authorization.get(getContext()), repoOwner, repoName, tinyDb.getString("locale"), tinyDb.getString("dateFormat"));
+		getRepoInfo(Authorization.get(getContext()), repoOwner, repoName, getResources().getConfiguration().locale, tinyDb.getString("dateFormat"));
 		getFileContents(Authorization.get(getContext()), repoOwner, repoName, getResources().getString(R.string.defaultFilename));
 
 		if(isExpandViewVisible()) {
@@ -173,7 +173,7 @@ public class RepoInfoFragment extends Fragment {
 		return binding.repoMetaFrame.getVisibility() == View.VISIBLE;
 	}
 
-	private void getRepoInfo(String token, final String owner, String repo, final String locale, final String timeFormat) {
+	private void getRepoInfo(String token, final String owner, String repo, final Locale locale, final String timeFormat) {
 
 		final TinyDB tinyDb = TinyDB.getInstance(getContext());
 
@@ -217,12 +217,12 @@ public class RepoInfoFragment extends Fragment {
 							binding.repoMetaWatchers.setText(repoInfo.getWatchers_count());
 							binding.repoMetaSize.setText(FileUtils.byteCountToDisplaySize((int) repoInfo.getSize() * 1024));
 
-							binding.repoMetaCreatedAt.setText(TimeHelper.formatTime(repoInfo.getCreated_at(), new Locale(locale), timeFormat, ctx));
+							binding.repoMetaCreatedAt.setText(TimeHelper.formatTime(repoInfo.getCreated_at(), locale, timeFormat, ctx));
 							if(timeFormat.equals("pretty")) {
 								binding.repoMetaCreatedAt.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(repoInfo.getCreated_at()), ctx));
 							}
 
-							String repoMetaUpdatedAt = TimeHelper.formatTime(repoInfo.getUpdated_at(), new Locale(locale), timeFormat, ctx);
+							String repoMetaUpdatedAt = TimeHelper.formatTime(repoInfo.getUpdated_at(), locale, timeFormat, ctx);
 
 							String website = (repoInfo.getWebsite().isEmpty()) ? getResources().getString(R.string.noDataWebsite) : repoInfo.getWebsite();
 							binding.repoMetaWebsite.setText(website);
diff --git a/app/src/main/java/org/mian/gitnex/helpers/TimeHelper.java b/app/src/main/java/org/mian/gitnex/helpers/TimeHelper.java
index 84d202dd..022cd9c9 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/TimeHelper.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/TimeHelper.java
@@ -43,7 +43,7 @@ public class TimeHelper {
 		switch(timeFormat) {
 
 			case "pretty": {
-				PrettyTime prettyTime = new PrettyTime(Locale.getDefault());
+				PrettyTime prettyTime = new PrettyTime(locale);
 				return prettyTime.format(date);
 			}
 
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
new file mode 100644
index 00000000..d7591b7a
--- /dev/null
+++ b/app/src/main/res/values/arrays.xml
@@ -0,0 +1,23 @@
+<resources>
+    <string-array name="languages">
+        <item>en</item>
+        <item>ar</item>
+        <item>zh</item>
+        <item>cs</item>
+        <item>fi</item>
+        <item>fr</item>
+        <item>de</item>
+        <item>it</item>
+        <item>lv</item>
+        <item>fa</item>
+        <item>pl</item>
+        <item>pt</item>
+        <item>ru</item>
+        <item>ru</item>
+        <item>sr</item>
+        <item>es</item>
+        <item>tr</item>
+        <item>uk</item>
+    </string-array>
+
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3574f267..9aff1aef 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -223,6 +223,7 @@
 
     <!-- settings -->
     <string name="settingsLanguageHeaderText">Translation</string>
+    <string name="settingsLanguageSystem">System</string>
     <string name="settingsSecurityHeader">Security</string>
     <string name="settingsCertsSelectorHeader">Delete Trusted Certificates</string>
     <string name="settingsCertsPopupTitle">Delete Trusted Certificates?</string>