Skip to content

Commit

Permalink
0.0.18b
Browse files Browse the repository at this point in the history
- Added all languages available on website Sav22999#20
- Added partial translations of Basque
  • Loading branch information
Sav22999 committed Jan 12, 2020
1 parent b10d6c2 commit 49138c7
Show file tree
Hide file tree
Showing 10 changed files with 225 additions and 23 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ android {
applicationId "org.commonvoice.saverio"
minSdkVersion 23
targetSdkVersion 28
versionCode = 36
versionName '0.0.18a'
versionCode = 38
versionName '0.0.18b'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand Down
Binary file modified app/release/app-release.aab
Binary file not shown.
12 changes: 10 additions & 2 deletions app/src/main/java/org/commonvoice/saverio/ListenActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,8 @@ class ListenActivity : AppCompatActivity() {
btnYes.isVisible = false
btnNo.isVisible = false
} else {
error1()
//println(" -->> Something wrong 1: "+it.toString()+" <<-- ")
error4()
btnSkip.isEnabled = true

btnYes.isVisible = false
Expand Down Expand Up @@ -212,13 +213,20 @@ class ListenActivity : AppCompatActivity() {
fun error1() {
var msg: TextView = this.findViewById(R.id.textMessageAlertListen)
var skipText: Button = this.findViewById(R.id.btn_skip_listen)
msg.text = getString(R.string.txt_error_1_try_again_press_skip).replace(
msg.text = getString(R.string.txt_error_1_try_again_tap_skip).replace(
"{{*{{skip_button}}*}}",
skipText.text.toString()
)
skipText.isEnabled = true
}

fun error4() {
var msg: TextView = this.findViewById(R.id.textMessageAlertListen)
var skipText: Button = this.findViewById(R.id.btn_skip_listen)
msg.text = getString(R.string.txt_error_4_clips_no_available)
skipText.isEnabled = true
}

override fun onBackPressed() {
var btnSkip: Button = this.findViewById(R.id.btn_skip_listen)
var txtSentence: TextView = this.findViewById(R.id.textListenSentence)
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/commonvoice/saverio/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import java.util.*
class MainActivity : AppCompatActivity() {

private val translations_languages: Array<String> =
arrayOf("en", "sv", "it", "fr") //change manually
arrayOf("en", "eu", "fr", "it", "sv") //change manually

private var firstRun = true
private val RECORD_REQUEST_CODE = 101
Expand Down Expand Up @@ -387,8 +387,8 @@ class MainActivity : AppCompatActivity() {
fun openTutorial() {
val intent = Intent(this, TutorialActivity::class.java).also {
startActivity(it)
finish()
}
finish()
}

fun openSpeakSection() {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/commonvoice/saverio/SpeakActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ class SpeakActivity : AppCompatActivity() {
btnRecord.isEnabled = true
msg.text = getString(R.string.txt_press_icon_below_speak_1)
} else {
//println(" -->> Something wrong: "+it.toString()+" <<-- ")
error1()
}
btnSkip.isEnabled = true
Expand Down Expand Up @@ -220,11 +221,10 @@ class SpeakActivity : AppCompatActivity() {
fun error1() {
var msg: TextView = this.findViewById(R.id.textMessageAlertSpeak)
var skipText: Button = this.findViewById(R.id.btn_skip_speak)
msg.text = getString(R.string.txt_error_1_try_again_press_skip).replace(
msg.text = getString(R.string.txt_error_1_try_again_tap_skip).replace(
"{{*{{skip_button}}*}}",
skipText.text.toString()
)

skipText.isEnabled = true
}

Expand Down
112 changes: 112 additions & 0 deletions app/src/main/res/values-eu/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- DO NOT TRANSLATE OR CHANGE THIS -->
<!-- Use the abbreviation of Common Voice (e.g. Italian -> it, Swedish -> sv-SE, ect.) -->
<string name="language">eu</string>
<!-- Buttons (nav) -->
<string name="title_home">Etxea</string>
<string name="title_dashboard">Dashboard</string>
<string name="title_settings">Ezarpenak</string>
<!-- Home (main) -->
<string name="description_cv_robot">Common Voice ikurra</string>
<string name="description_cv_logo">Common Voice robota</string>
<string name="button_home_login">Hasi saioa / eman izena</string>
<string name="button_home_logout">Amaitu saioa</string>
<string name="button_home_profile">Profile</string>
<string name="text_hi_username">Kaixo</string>
<!-- Dashboard -->
<string name="dashboardStatistics">Estatistikak</string>
<string name="dashboardVoicesOnline">Voices online</string>
<string name="dashboardTabYou">Zu</string>
<string name="dashboardTabEveryone">Denak</string>
<string name="dashboardToday">Gaur</string>
<string name="dashboardEver">Ever</string>
<string name="toastNoLoginNoStatistics">Konektatu behar duzu zure estatistikak ikusteko</string>
<string name="textHoursAbbreviation">h</string>
<string name="textHour">Orduak</string>
<!-- Tutorial -->
<string name="btn_tutorial1">Hasi</string>
<string name="btn_tutorial2">Permit</string>
<string name="btn_tutorial3">Next</string>
<string name="btn_tutorial4">Try again</string>
<string name="btn_tutorial5">Finish</string>
<string name="linkTermsCommonVoice">https://voice.mozilla.org/en/terms</string>
<string name="tutorial_text1">This is not the official app of Common Voice. It\'s developed by Saverio Morelli without any support or partnership with Mozilla.</string>
<string name="tutorial_terms">By proceeding, you agree to the Terms of Service of Common Voice.</string>
<string name="tutorial_text2">Common Voice App needs the \"Microphone\" permission to work correctly.</string>
<string name="tutorial_text3">Common Voice App needs the \"Storage\" permission to work correctly.</string>
<string name="tutorial_text4">Choose your native language, it will use to show sentences to record and to validate</string>
<!-- DO NOT TRANSLATE OR CHANGE THIS - Languages (list) sort "A-Z" - "languages" and "languages_short" sort MUST coincide (e.g. Italian and it, English and en, ect.) -->
<!-- DO NOT TRANSLATE OR CHANGE THIS - Abbreviation of Common Voice (e.g. Italian -> it, Swedish -> sv-SE, ect.) -->
<!-- Login -->
<string name="txt_loading_page">Loading ...</string>
<string name="txt_profile_username">Username</string>
<string name="txt_profile_email">Email</string>
<string name="txt_profile_age">Age</string>
<string name="txt_profile_gender">Gender</string>
<string name="txt_profile_edit_data_alert">To modify your profile information, go to official website.</string>
<string name="txt_login_successful_alert">Login successful!</string>
<string name="txt_gender_male">Male</string>
<string name="txt_gender_female">Female</string>
<string name="txt_gender_other">Other</string>
<!-- Settings -->
<string name="btn_open_tutorial_settings">Open Tutorial again</string>
<string name="txt_project_github_settings">Project open-source on GitHub</string>
<string name="txt_contributors">main contributors</string>
<string name="txt_developed_by">developed by</string>
<string name="toast_language_changed">Language changed correctly to {{*{{lang}}*}}</string>
<string name="settingsLanguage">Language</string>
<string name="txt_donate_paypal_settings">Donate to the developer on PayPal</string>
<!-- Speak & Listen-->
<string name="txt_loading_sentence">Loading a sentence ...</string>
<string name="btn_skip_sentence">Skip</string>
<string name="btn_send_sentence">Send recording</string>
<string name="txt_loading_clip">Loading a clip ...</string>
<string name="txt_press_icon_below_speak_1">Press the icon below to start the recording</string>
<string name="txt_press_icon_below_speak_2">Press the icon below to stop the recording</string>
<string name="txt_sentence_recorded">Sentence recorded. Listen the recording</string>
<string name="txt_sentence_record_failed">Recording failed. Try again please</string>
<string name="txt_recorded_correct_or_wrong">Recording correct? Send it.\nRecording wrong? Record the sentence again</string>
<string name="txt_listening_stopped">Listen the recording entirely to ensure it\'s correct</string>
<string name="txt_listening_again_recording">Press the icon below to stop the listening</string>
<string name="txt_recording_too_long">Recording is too long. Max duration is 10 seconds</string>
<string name="txt_sending_recording">Sending the recording ...</string>
<string name="txt_recording_sent">Recording sent!</string>
<string name="txt_sending_recording_failed">Sending recording failed!</string>
<string name="txt_sending_recording_failed_and_skip">Sending recording failed! Try again to send it otherwise press {{*{{skip_button}}*}} button</string>
<string name="txt_press_icon_below_listen_1">Press the icon below to start the clip</string>
<string name="txt_press_icon_below_listen_2">Press the icon below to stop the clip</string>
<string name="txt_clip_correct_or_wrong">The clip is correct? Press the Thumb up\nThe clip is wrong? Press the Thumb down</string>
<string name="txt_clip_again">Press the icon below to start the clip again</string>
<string name="txt_clip_validated_yes">Clip accepted!</string>
<string name="txt_clip_validated_no">Clip rejected!</string>
<string name="txt_error_1_try_again_tap_skip">Error. Try again, so tap on {{*{{skip_button}}*}} button</string>
<string name="txt_error_2_sending_failed">Error during the sending of the recording. The audio wasn\'t sent to server</string>
<string name="txt_sending_validation">Sending the validation ...</string>
<string name="txt_error_3_sending_validation_failed">Error during the sending of the validation. Try again or press {{*{{skip_button}}*}} button</string>
<string name="txt_closing">Closing ...</string>
<string name="txt_error_4_clips_no_available">Error. There aren\'t any other clips to validate for this language.</string>
<!-- NoConnection -->
<string name="btn_check_again_noconnection">Check again</string>
<string name="txt_noconnection">Internet connection isn\'t available now. Please, connect to WiFi network or mobile data and then press on the button below</string>
<!-- First-run Speak & Listen -->
<string name="txt1_tutorial_speak">This is the sentence you must record.</string>
<string name="txt2_tutorial_speak_and_listen">Here you can find sentences which guide you every time.</string>
<string name="txt3_tutorial_speak">If you don\'t like the sentence, you can tap on this button to skip and get another one.</string>
<string name="txt4_tutorial_speak">Tap on this icon to start the recording.</string>
<string name="txt5_tutorial_speak">Tap on this icon to stop the recording.</string>
<string name="txt6_tutorial_speak">Tap on this icon to listen the recording.</string>
<string name="txt7_tutorial_speak">Tap on this icon to record again the sentence, in case there are mistakes in the previous one.</string>
<string name="txt8_tutorial_speak">Tap on this icon to listen again the recording.</string>
<string name="txt9_tutorial_speak">Tap on this button to send the recording.</string>
<string name="txt1_tutorial_listen">This is the sentence/clip you must validate.</string>
<string name="txt3_tutorial_listen">If you don\'t like the clip, you can tap on this button to skip and get another one.</string>
<string name="txt4_tutorial_listen">Tap on this icon to play the clip to validate.</string>
<string name="txt5_tutorial_listen">Tap on this icon to stop the listening of the clip.</string>
<string name="txt6_tutorial_listen">Tap on this icon if you want to listen again the clip.</string>
<string name="txt7_tutorial_listen">Tap on this icon if the clip coincides with the sentence, so to accept it.</string>
<string name="txt8_tutorial_listen">Tap on this icon if the clip doesn\'t coincide with the sentence, so to reject it.</string>
<!-- NotAvailableNow -->
<string name="txtNotAvailableNow">So sorry, this feature isn\'t available now.\nWe\'re working constantly to improve the app.</string>
</resources>
11 changes: 6 additions & 5 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<!-- Dashboard -->
<string name="dashboardStatistics">Statistiques</string>
<string name="dashboardVoicesOnline">Voix en ligne</string>
<string name="dashboardTabYou">Tu</string>
<string name="dashboardTabYou">Vous</string>
<string name="dashboardTabEveryone">Tout le monde</string>
<string name="dashboardToday">Aujourd\'hui</string>
<string name="dashboardEver">Depuis le début</string>
Expand Down Expand Up @@ -54,13 +54,13 @@
<string name="btn_open_tutorial_settings">Ouvrir le tutoriel à nouveau</string>
<string name="txt_project_github_settings">Projet open-source sur GitHub</string>
<string name="txt_contributors">contributeurs principaux</string>
<string name="txt_developed_by">developed by</string>
<string name="txt_developed_by">développé par</string>
<string name="toast_language_changed">Language changed correctly to {{*{{lang}}*}}</string>
<string name="settingsLanguage">Language</string>
<string name="settingsLanguage">Langue</string>
<string name="txt_donate_paypal_settings">Donate to the developer on PayPal</string>
<!-- Speak & Listen-->
<string name="txt_loading_sentence">Loading a sentence ...</string>
<string name="btn_skip_sentence">Skip</string>
<string name="btn_skip_sentence">Passer</string>
<string name="btn_send_sentence">Send recording</string>
<string name="txt_loading_clip">Loading a clip ...</string>
<string name="txt_press_icon_below_speak_1">Press the icon below to start the recording</string>
Expand All @@ -81,11 +81,12 @@
<string name="txt_clip_again">Press the icon below to start the clip again</string>
<string name="txt_clip_validated_yes">Clip accepted!</string>
<string name="txt_clip_validated_no">Clip rejected!</string>
<string name="txt_error_1_try_again_press_skip">Error. Try again, so press {{*{{skip_button}}*}} button</string>
<string name="txt_error_1_try_again_tap_skip">Error. Try again, so tap on {{*{{skip_button}}*}} button</string>
<string name="txt_error_2_sending_failed">Error during the sending of the recording. The audio wasn\'t sent to server</string>
<string name="txt_sending_validation">Sending the validation ...</string>
<string name="txt_error_3_sending_validation_failed">Error during the sending of the validation. Try again or press {{*{{skip_button}}*}} button</string>
<string name="txt_closing">Closing ...</string>
<string name="txt_error_4_clips_no_available">Error. There aren\'t any other clips to validate for this language.</string>
<!-- NoConnection -->
<string name="btn_check_again_noconnection">Check again</string>
<string name="txt_noconnection">Internet connection isn\'t available now. Please, connect to WiFi network or mobile data and then press on the button below</string>
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,12 @@
<string name="txt_clip_again">Premi l\'icona sotto per ascoltare nuovamente l\'audio</string>
<string name="txt_clip_validated_yes">Registrazione accettata!</string>
<string name="txt_clip_validated_no">Registrazione declinata!</string>
<string name="txt_error_1_try_again_press_skip">Errore. Riprovare, quindi premere il bottone {{*{{skip_button}}*}}</string>
<string name="txt_error_1_try_again_tap_skip">Errore. Riprovare, quindi premere il bottone {{*{{skip_button}}*}}</string>
<string name="txt_error_2_sending_failed">Errore durante l\'invio della registrazione, perciò non è stata inviata al server</string>
<string name="txt_sending_validation">Invio della convalida in corso ...</string>
<string name="txt_error_3_sending_validation_failed">Errore durante l\'invio della convalida. Riprovare, altrimenti premere sul bottone {{*{{skip_button}}*}}</string>
<string name="txt_closing">Chiusura in corso ...</string>
<string name="txt_error_4_clips_no_available">Errore. Non ci sono altre registrazioni da convalidare per questa lingua.</string>
<!-- NoConnection -->
<string name="btn_check_again_noconnection">Verifica nuovamente</string>
<string name="txt_noconnection">Al momento non è disponibile alcuna connessione Internet. Connettersi a una rete WiFi o alla connessione dati dello smartphone, poi premere sul bottone seguente</string>
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/res/values-sv/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,14 @@
<string name="txt_clip_again">Tryck på ikonen nedan för att starta klippet igen</string>
<string name="txt_clip_validated_yes">Klipp godkännt!</string>
<string name="txt_clip_validated_no">Klipp refuserat!</string>
<string name="txt_error_1_try_again_press_skip">Fel- Försök igen, tryck {{*{{skip_button}}*}} knappen</string>
<string name="txt_error_1_try_again_tap_skip">Fel- Försök igen, tryck {{*{{skip_button}}*}} knappen</string>
<string name="txt_error_2_sending_failed">Fel vid uppladdning av inspelningen. Ljudfilen blev inte överförd till servern</string>
<string name="txt_sending_validation">Laddar upp valideringen ...</string>
<string name="txt_error_3_sending_validation_failed">Fel vid uppladdninen av valideringen. Försök igen eller tryck på {{*{{skip_button}}*}} knappen</string>
<string name="txt_closing">Avslutar ...</string>
<string name="txt_error_4_clips_no_available">Error. There aren\'t any other clips to validate for this language.</string>
<!-- NoConnection -->
<string name="btn_check_again_noconnection">Check again</string>
<string name="btn_check_again_noconnection">Kontrollera igen</string>
<string name="txt_noconnection">Internet connection isn\'t available now. Please, connect to WiFi network or mobile data and then press on the button below</string>
<!-- First-run Speak & Listen -->
<string name="txt1_tutorial_speak">This is the sentence you must record.</string>
Expand Down
Loading

0 comments on commit 49138c7

Please sign in to comment.