Skip to content

Commit

Permalink
Update tetum strings, remove in-app language preference
Browse files Browse the repository at this point in the history
- App language is now set by phone language
- Indonesian strings are currently in tetum, as tetum
  isn't an Android-supported language
  • Loading branch information
Warwick Stone committed Sep 23, 2017
2 parents 00376b2 + 251cf62 commit f924129
Show file tree
Hide file tree
Showing 10 changed files with 434 additions and 108 deletions.
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
package org.rhok.linguist.activity.common;

import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.preference.PreferenceActivity;
import android.os.Bundle;

import org.rhok.linguist.R;

import java.util.Locale;

/**
* Created by lachlan on 17/06/2015.
*
Expand Down Expand Up @@ -42,16 +39,5 @@ protected void onPause() {

public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
String key) {

// this is called when the user changes any of their preferences
// at the moment we change the user's locale in BaseInterviewActivity
// instead of here

if (key.equals("pref_tetum")) {

// Set summary to be the user-description for the selected value
// connectionPref.setSummary(sharedPreferences.getString(key, ""));

}
}
}
Original file line number Diff line number Diff line change
@@ -1,26 +1,17 @@
package org.rhok.linguist.activity.common;

import android.content.Intent;
import android.support.v7.app.ActionBarActivity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;

import org.rhok.linguist.R;
import org.rhok.linguist.activity.IntentUtil;
import org.rhok.linguist.activity.interview.InterviewNameActivity;
import org.rhok.linguist.activity.old.HomeActivity;
import org.rhok.linguist.activity.old.UploadActivity;
import org.rhok.linguist.activity.recording.InterviewResponseLanguageActivity;
import org.rhok.linguist.activity.recording.RecordingInstructionsActivity;
import org.rhok.linguist.api.models.Interviewer;
import org.rhok.linguist.application.LinguistApplication;
import org.rhok.linguist.code.LocaleHelper;
import org.rhok.linguist.code.PreferencesHelper;
import org.rhok.linguist.util.StringUtils;


public class SplashActivity extends AppCompatActivity {
Expand Down Expand Up @@ -86,12 +77,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
@Override
protected void onResume() {
super.onResume();

// If the user changes the locale in the settings we need to
// recreate the activity so that the new resources are loaded in
if (LocaleHelper.updateLocale(getBaseContext(), this)) {
this.recreate();
}
interviewer = PreferencesHelper.getInterviewer();
if (interviewer==null){
//create default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
import org.rhok.linguist.R;
import org.rhok.linguist.activity.common.BaseActivity;
import org.rhok.linguist.activity.common.SplashActivity;
import org.rhok.linguist.activity.old.UploadActivity;
import org.rhok.linguist.code.LocaleHelper;

/**
* Created by lachlan on 18/06/2015.
Expand Down Expand Up @@ -53,11 +51,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
@Override
protected void onResume() {
super.onResume();

if (LocaleHelper.updateLocale(getBaseContext(), this)) {
this.recreate();
}

}

}

This file was deleted.

6 changes: 6 additions & 0 deletions LanguageRecorder/app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Local Linguist</string>
<string name="splash_start_button">French start</string>
<string name="start_button">French start</string>
</resources>
212 changes: 212 additions & 0 deletions LanguageRecorder/app/src/main/res/values-in/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,212 @@
<resources>
<string name="app_name">Local Linguist</string>

<string name="request_fail">Deskulpa, ligasaun ba internet lakon. Favór ida koko fali.</string>
<string name="request_fail_server_error">Iha problema ho ami nia ligasaun internet. Favór ida koko fali orsida</string>
<string name="request_fail_unauthorized">"Deskulpa, ita log out tiha ona. Favor ida login fali."</string>
<string name="request_fail_re_auth">Ita logout tiha ona, prosesu hela…</string>
<string name="no_internet_available">Laiha asesu ba internet</string>
<string name="empty_result">Laiha dadus atu foti agora.</string>


<string name="refresh">Halo foun (refresh)</string>
<string name="submit">Haruka</string>
<string name="cancel">Para (Cancel)</string>
<string name="clear">Hamoos</string>
<string name="back">Ba kotuk</string>
<string name="ok">OK</string>
<string name="save">Save</string>
<string name="edit">Edit</string>
<string name="done">Hotu ona</string>
<string name="search">Buka</string>
<string name="delete">Hapus</string>
<string name="error">Error</string>
<string name="yes">Sin</string>
<string name="no">Lae</string>
<string name="on">On</string>
<string name="off">Off</string>
<string name="retry">Koko fali</string>
<string name="dismiss">Husik ba</string>
<string name="message">Mensajen</string>
<string name="expired">Taka ona</string>
<string name="send">Haruka</string>
<string name="confirm">Konfirma</string>


<!-- Splash screen settings -->
<string name="splash_start_button">Komesa</string>

<string name="study_question_count_format">"%1$s pergunta"</string>
<string name="study_title_select">Favór ida hili dadus</string>


<string name="interview_title">Entrevista</string>
<string name="interview_name">Ita-nia naran kompletu saida?</string>
<string name="interview_age">Ita-nia tinan hira?</string>
<string name="interview_years">(tinan)</string>
<string name="interview_gender">Ita mane ka feto?</string>
<string name="interview_occupation">Ita-nia servisu saida?</string>
<string name="interview_education">"Ita-nia edukasaun to'o iha ne'ebé?"</string>
<string name="interview_primarylanguage">Ita-nia lian inan saida?</string>
<string name="interview_morelanguages">Ita hatene lian seluk ka lae?</string>



<string name="interview_municipality_lives">Ita hela iha Munisípiu saida?</string>
<string name="interview_district_lives">Iha ##municipality##, ita hela iha Postu Administrativu saida?</string>
<string name="interview_village_lives">Iha ##district##, ita hela iha suku saida?</string>

<string name="interview_lived_life">Ita hela iha ##village## ita-nia moris tomak ka lae?</string>

<string name="interview_municipality_born">Ita moris iha munisípi saida?</string>
<string name="interview_district_born">Iha ##municipality##, ita moris iha Postu Administrativu saida?</string>
<string name="interview_village_born">Iha ##district##, ita moris iha suku saida?</string>

<string name="interview_lived_length">Ita moris iha ##village## tinan hira ona?</string>

<string name="interview_audio_instructions">"Favor ida temi liafuan ba foto ne'ebé ita haree."</string>
<string name="interview_audio_recording">"Ne'e saida?"</string>
<string name="interview_recording">Grava hela</string>
<string name="interview_audio_playing">Rona hela gravasaun</string>
<string name="interview_audio_replay">Ita hakarak rona fali gravasaun?</string>
<string name="interview_audio_playback_error">Ita labele rona gravasaun. Koko fali?</string>
<string name="interview_recording_ok">"Gravasaun ne'e di'ak ka lae?"</string>
<string name="interview_transcribe">"Ita hakerek liafuan ne'e hanesan saida?"</string>

<string name="phrase_prompt_text">##input_instruction## depois ##output_instruction##</string>
<string name="phrase_prompt_text_input_picture">Haree foto </string>
<string name="phrase_prompt_text_input_audio">Rona gravasaun</string>
<string name="phrase_prompt_text_output_text">hakerek liafaun iha ita-nia lian</string>
<string name="phrase_prompt_text_output_audio">grava iha ita-nia lian</string>
<string name="phrase_prompt_text_output_audio_text">grava no hakerek iha ita nia lian</string>
<string name="phrase_prompt_text_output_choices">"hili opsaun ne'ebé loos"</string>
<string name="phrase_prompt_text_output_audio_choices">"grava iha ita nia lian, no hili opsaun ne'ebé loos"</string>

<!-- Button settings -->
<string name="next_button">Tuirmai</string>
<string name="start_button">Komesa</string>
<string name="yes_button">Sin</string>
<string name="no_button">Lae</string>

<string name="home_title">Fila ba oin</string>
<string name="home_select_person">Hili Ema</string>
<string name="home_edit_button">Edit</string>
<string name="home_add_person_button">Aumenta ema foun</string>
<string name="home_start_capturing_button">Komesa grava</string>
<string name="home_data_upload_button">Upload Dadus</string>
<string name="home_select_person_toast">Favor ida hili ema</string>

<string name="capture_title">Lingua</string>
<string name="capture_word_hint">Deskrisaun</string>
<string name="capture_record_button">Grava</string>
<string name="capture_play_button">Play</string>
<string name="capture_stop_button">Para</string>
<string name="capture_back_button">Ba kotuk</string>
<string name="capture_next_button">Ba oin</string>
<string name="capture_for_label">Grava ba</string>

<string name="settings_title">Settings</string>
<string name="settings_disk_size_label">Total disk size</string>
<string name="settings_disk_free_label">Total space free</string>

<string name="person_title">Aumenta ema foun</string>
<string name="person_title_edit">Edit ema</string>
<string name="person_is_new_question">"Ita entrevista ona ema ne'e ka seidauk?"</string>
<string name="person_title_select">Favor ida hili ema</string>
<string name="person_name_label">Naran</string>
<string name="person_age_label">Tinan</string>
<string name="person_gender_label">Mane ka feto</string>
<string name="person_livesin_label">Hela iha</string>
<string name="person_livesinfor_label">Ba tinan</string>
<string name="person_firstlanguage_label">Lian inan (primeiru)</string>
<string name="person_secondlanguage_label">Lian segundu</string>
<string name="person_thirdlanguage_label">Lian terseiru</string>
<string name="person_otherlanguages_label">Lian seluk</string>
<string name="person_mylocation_label">"Ha'u-nia lokasaun"</string>
<string name="person_education_label">"Hetan edukasaun to'o nivel"</string>
<string name="person_ok_button">Ok</string>
<string name="person_delete_button">Hapus</string>
<string name="person_enter_name_toast">Favór ida hatama ema nia naran</string>
<string name="person_updated_toast">"Ema ne'e update tiha ona"</string>
<string name="person_added_toast">"Ema ne'e hatama tiha ona"</string>

<!-- interviewer details -->
<string name="person_mobile_phone">Numeru telefone</string>
<string name="person_email">Email</string>
<string name="interviewer_name_format">Peskizadór: %1$s</string>
<string name="interviewer_name_edit">Edit Peskizadór nia naran</string>

<string name="person_gender_male">Mane</string>
<string name="person_gender_female">Feto</string>

<string name="person_education_primary">Eskola Primaria</string>
<string name="person_education_secondary">Eskola Sekundaria</string>
<string name="person_education_university">Universidade</string>

<string name="menu_cancel_interview">Hapara enttrevista</string>
<string name="menu_upload_interview">Upload</string>
<string name="menu_skip_question">"Lakohi hatan pergunta ne'e"</string>
<string name="interview_response_language_other">Seluk</string>

<string-array name="person_languages_array">
<item>english</item>
<item>french</item>
<item>german</item>
<item>italian</item>
<item>japanese</item>
<item>korean</item>
</string-array>


<string name="upload_title">Upload Data</string>
<string name="upload_interviews_format">Ready to upload %1$d interviews</string>
<string name="upload_number_of_people_label">Number of people interviewed</string>
<string name="upload_upload_data_button">Upload Data</string>
<string name="upload_starting_upload">starting upload</string>
<string name="upload_starting_upload_format">starting upload of %1$d interviews</string>
<string name="upload_uploading_data">uploading data</string>
<string name="upload_uploading_audio">uploading audio file</string>
<string name="upload_upload_complete">upload complete</string>

<string name="delete_person_title">Delete Person</string>

<string name="hello_world">Hello world!</string>
<string name="action_settings">Settings</string>
<string name="title_activity_name_capture">NameCaptureActivity</string>
<string name="title_activity_age_capture">AgeCaptureActivity</string>
<string name="title_activity_gender_capture">GenderCaptureActivity</string>
<string name="title_activity_home_capture">HomeCaptureActivity</string>
<string name="INTENT_PERSONID">org.rhok.linguist.personid</string>
<string name="title_activity_years_in_home_capture">YearsInHomeCaptureActivity</string>
<string name="title_activity_activity_occupation_capture">activity_occupation_capture</string>
<string name="title_activity_occupation_activity">occupation_activity</string>
<string name="title_activity_occupation_capture">OccupationCaptureActivity</string>
<string name="title_activity_education">EducationActivity</string>
<string name="title_activity_spoken_language">SpokenLanguageActivity</string>
<string name="title_activity_more_languages">MoreLanguagesActivity</string>
<string name="title_activity_how_long_lived">HowLongLivedActivity</string>
<string name="title_activity_district_born">DistrictBornActivity</string>
<string name="title_activity_sub_district_born">SubDistrictBornActivity</string>
<string name="title_activity_village_born">VillageBornActivity</string>
<string name="title_activity_location">LocationActivity</string>
<string name="title_activity_sub_district">SubDistrictActivity</string>
<string name="title_activity_village">VillageActivity</string>
<string name="title_activity_study">StudyActivity</string>
<string name="title_activity_home_new">HomeNew</string>
<string name="title_activity_interview_name">InterviewNameActivity</string>
<string name="title_activity_interview_age">InterviewAgeActivity</string>
<string name="title_activity_interview_gender">InterviewGenderActivity</string>
<string name="title_activity_interview_occupation">InterviewOccupation</string>
<string name="title_activity_interview_education">InterviewEducationActivity</string>
<string name="title_activity_interview_more_languages">InterviewMoreLanguagesActivity</string>
<string name="title_activity_interview_lived_life">InterviewLivedLifeActivity</string>
<string name="title_activity_interview_lived_length">InterviewLivedLengthActivity</string>
<string name="title_activity_recording_audio">RecordingAudioActivity</string>
<string name="title_activity_recording_instructions">RecordingInstructionsActivity</string>
<string name="title_activity_recording_listen">RecordingListenActivity</string>
<string name="title_activity_recording_transcribe">RecordingTranscribeActivity</string>
<string name="title_activity_app_settings">AppSettingsActivity</string>
<string name="title_activity_interviewer">Interviewer Details</string>


</resources>
Loading

0 comments on commit f924129

Please sign in to comment.