lovis_ix/Pilldroid
1
1
Fork 0
mirror of https://github.com/jfoucry/Pilldroid.git synced 2024-11-22 04:29:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some typos

Browse source
This commit is contained in:
jacques 2022-03-01 20:43:32 +01:00
parent 46811d4d71
commit f31a5a2550
6 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/net/foucry/pilldroid/DrugDetailFragment.java
View file

@ -80,13 +80,13 @@ public class DrugDetailFragment extends Fragment {
presentationView = detailView.findViewById(R.id.presentation_cell); presentationView = detailView.findViewById(R.id.presentation_cell);
TextView presentationLabel = presentationView.findViewById(R.id.label); TextView presentationLabel = presentationView.findViewById(R.id.label);
TextView presentationValue = presentationView.findViewById(R.id.value); TextView presentationValue = presentationView.findViewById(R.id.value);
presentationLabel.setText(R.string.drug_presention_labal); presentationLabel.setText(R.string.drug_presentation_label);
presentationValue.setText(drug.getPresentation()); presentationValue.setText(drug.getPresentation());
adminModeView = detailView.findViewById(R.id.administration_cell); adminModeView = detailView.findViewById(R.id.administration_cell);
TextView adminModeLabel = adminModeView.findViewById(R.id.label); TextView adminModeLabel = adminModeView.findViewById(R.id.label);
TextView adminModeValue = adminModeView.findViewById(R.id.value); TextView adminModeValue = adminModeView.findViewById(R.id.value);
adminModeLabel.setText(R.string.drug_administationMode_label); adminModeLabel.setText(R.string.drug_administrationMode_label);
adminModeValue.setText(drug.getAdministration_mode()); adminModeValue.setText(drug.getAdministration_mode());
stockView = detailView.findViewById(R.id.stock_cell); stockView = detailView.findViewById(R.id.stock_cell);
@ -108,17 +108,17 @@ public class DrugDetailFragment extends Fragment {
warningView = detailView.findViewById(R.id.warning_cell); warningView = detailView.findViewById(R.id.warning_cell);
TextView warningLibelle = warningView.findViewById(R.id.label); TextView warningLibelle = warningView.findViewById(R.id.label);
TextView warningValue = warningView.findViewById(R.id.value); TextView warningValue = warningView.findViewById(R.id.value);
warningLibelle.setText(R.string.drug_warningTherehold_label); warningLibelle.setText(R.string.drug_warningThreshold_label);
warningValue.setText(Integer.toString(drug.getWarnThreshold())); warningValue.setText(Integer.toString(drug.getWarnThreshold()));
warningValue.setHint(R.string.drug_warningTherehold_label); warningValue.setHint(R.string.drug_warningThreshold_label);
warningValue.setSelectAllOnFocus(true); warningValue.setSelectAllOnFocus(true);
alertView = detailView.findViewById(R.id.alert_cell); alertView = detailView.findViewById(R.id.alert_cell);
TextView alertLibelle = alertView.findViewById(R.id.label); TextView alertLibelle = alertView.findViewById(R.id.label);
TextView alertValue = alertView.findViewById(R.id.value); TextView alertValue = alertView.findViewById(R.id.value);
alertLibelle.setText(R.string.drug_alertTherehold_label); alertLibelle.setText(R.string.drug_alertThreshold_label);
alertValue.setText(Integer.toString(drug.getAlertThreshold())); alertValue.setText(Integer.toString(drug.getAlertThreshold()));
alertValue.setHint(R.string.drug_alertTherehold_label); alertValue.setHint(R.string.drug_alertThreshold_label);
alertValue.setSelectAllOnFocus(true); alertValue.setSelectAllOnFocus(true);
} }

2
app/src/main/res/layout/activity_custom_scanner.xml
View file

@ -22,7 +22,7 @@
android:layout_marginEnd="@dimen/fab_margin" android:layout_marginEnd="@dimen/fab_margin"
android:layout_marginBottom="@dimen/fab_margin" android:layout_marginBottom="@dimen/fab_margin"
android:backgroundTint="@android:color/transparent" android:backgroundTint="@android:color/transparent"
android:contentDescription="@string/flashlighButton" android:contentDescription="@string/flashlightButton"
android:onClick="switchFlashlight" android:onClick="switchFlashlight"
android:src="@drawable/ic_baseline_highlight_24" /> android:src="@drawable/ic_baseline_highlight_24" />
</com.journeyapps.barcodescanner.DecoratedBarcodeView> </com.journeyapps.barcodescanner.DecoratedBarcodeView>

2
app/src/main/res/layout/welcome3.xml
View file

@ -10,7 +10,7 @@
<ImageView <ImageView
android:layout_width="@dimen/img_width_height" android:layout_width="@dimen/img_width_height"
android:layout_height="@dimen/img_width_height" android:layout_height="@dimen/img_width_height"
android:contentDescription="@string/barre_code_icone" android:contentDescription="@string/barcode_icon"
android:src="@drawable/ic_barcode" /> android:src="@drawable/ic_barcode" />
<TextView <TextView

2
app/src/main/res/layout/welcome9.xml
View file

@ -10,7 +10,7 @@
<ImageView <ImageView
android:layout_width="@dimen/screen_shot_height" android:layout_width="@dimen/screen_shot_height"
android:layout_height="@dimen/screen_shot_height" android:layout_height="@dimen/screen_shot_height"
android:contentDescription="@string/tunables" android:contentDescription="@string/tunable"
android:src="@drawable/tunable" /> android:src="@drawable/tunable" />
<TextView <TextView

14
app/src/main/res/values-fr-rFR/strings.xml
View file

@ -3,22 +3,22 @@
<string name="title_drug_detail">Détail Médicament</string> <string name="title_drug_detail">Détail Médicament</string>
<string name="button_cancel">Annuler</string> <string name="button_cancel">Annuler</string>
<string name="button_ok">OK</string> <string name="button_ok">OK</string>
<string name="drug_presention_labal">Présentation</string> <string name="drug_presentation_label">Présentation</string>
<string name="drug_name_label">Nom</string> <string name="drug_name_label">Nom</string>
<string name="drug_administationMode_label">Mode d\'adminitration</string> <string name="drug_administrationMode_label">Mode d\'adminitration</string>
<string name="msgNotFound">Médicament introuvable dans la base de données</string> <string name="msgNotFound">Médicament introuvable dans la base de données</string>
<string name="about">À propos</string> <string name="about">À propos</string>
<string name="help">Aide</string> <string name="help">Aide</string>
<string name="drug_take_label">Prise</string> <string name="drug_take_label">Prise</string>
<string name="drug_alertTherehold_label">Seuil critique</string> <string name="drug_alertThreshold_label">Seuil critique</string>
<string name="drug_warningTherehold_label">Seuil d\'alerte</string> <string name="drug_warningThreshold_label">Seuil d\'alerte</string>
<string name="msgFound">Médicament trouvé dans la base de données</string> <string name="msgFound">Médicament trouvé dans la base de données</string>
<string name="drug_current_stock_label">Stock courant</string> <string name="drug_current_stock_label">Stock courant</string>
<string name="notification_text">Vous devez passer à la pharmacie</string> <string name="notification_text">Vous devez passer à la pharmacie</string>
<string name="button_keyboard">Utilisez le clavier</string> <string name="button_keyboard">Utilisez le clavier</string>
<string name="detail_view">Vue de détail</string> <string name="detail_view">Vue de détail</string>
<string name="save_button">Enrefistrez</string> <string name="save_button">Enrefistrez</string>
<string name="flashlighButton">Allumez/Éteignez le Flash</string> <string name="flashlightButton">Allumez/Éteignez le Flash</string>
<string name="enter_cip_13_here">Enter cip 13 here..</string> <string name="enter_cip_13_here">Enter cip 13 here..</string>
<string name="enter_cip_13">Enter CIP 13</string> <string name="enter_cip_13">Enter CIP 13</string>
@ -42,12 +42,12 @@
<string name="the_plus_icon">L\'icône Plus</string> <string name="the_plus_icon">L\'icône Plus</string>
<string name="slide4_desc">Pour trouver le CIP13</string> <string name="slide4_desc">Pour trouver le CIP13</string>
<string name="happy_face">Visage souriant</string> <string name="happy_face">Visage souriant</string>
<string name="barre_code_icone">Icône de code barre</string> <string name="barcode_icon">Icône de code barre</string>
<string name="qr_code_icon">icône de QR-Code</string> <string name="qr_code_icon">icône de QR-Code</string>
<string name="neutral_face">Visage neutre</string> <string name="neutral_face">Visage neutre</string>
<string name="unhappy_face">Visage grincheux</string> <string name="unhappy_face">Visage grincheux</string>
<string name="drug_info">Capture d\'écran sur la partie information du médicament</string> <string name="drug_info">Capture d\'écran sur la partie information du médicament</string>
<string name="tunables">Réglages</string> <string name="tunable">Réglages</string>
<string name="slide10_desc">Mettre la prise à zéro suspend le traitement et les calculs de stock</string> <string name="slide10_desc">Mettre la prise à zéro suspend le traitement et les calculs de stock</string>
<string name="suspended_treatment_icon">Icône de traitemernt suspendu</string> <string name="suspended_treatment_icon">Icône de traitemernt suspendu</string>
<string name="slide11_desc">Pour enregistrer les changements, utilisez l\'icône de sauvegarde</string> <string name="slide11_desc">Pour enregistrer les changements, utilisez l\'icône de sauvegarde</string>

16
app/src/main/res/values/strings.xml
View file

@ -8,16 +8,16 @@
<string name="help">Help</string> <string name="help">Help</string>
<string name="notification_text">You have to go to the pharmacy</string> <string name="notification_text">You have to go to the pharmacy</string>
<string name="drug_name_label">Name</string> <string name="drug_name_label">Name</string>
<string name="drug_presention_labal">Presentation</string> <string name="drug_presentation_label">Presentation</string>
<string name="drug_administationMode_label">Administration mode</string> <string name="drug_administrationMode_label">Administration mode</string>
<string name="drug_current_stock_label">Current stock</string> <string name="drug_current_stock_label">Current stock</string>
<string name="drug_take_label">Take</string> <string name="drug_take_label">Take</string>
<string name="drug_warningTherehold_label">Alert threshold</string> <string name="drug_warningThreshold_label">Alert threshold</string>
<string name="drug_alertTherehold_label">Critical threshold</string> <string name="drug_alertThreshold_label">Critical threshold</string>
<string name="button_keyboard">"Use the keyboard"</string> <string name="button_keyboard">"Use the keyboard"</string>
<string name="detail_view">Detail view</string> <string name="detail_view">Detail view</string>
<string name="save_button">Save</string> <string name="save_button">Save</string>
<string name="flashlighButton">Toggle Flash</string> <string name="flashlightButton">Toggle Flash</string>
<string name="enter_cip_13_here">Enter cip 13 here..</string> <string name="enter_cip_13_here">Enter cip 13 here..</string>
<string name="enter_cip_13">Enter CIP 13</string> <string name="enter_cip_13">Enter CIP 13</string>
<string name="channel_description" translatable="false">PillDroid_NotificationChannel</string> <string name="channel_description" translatable="false">PillDroid_NotificationChannel</string>
@ -25,7 +25,7 @@
<!-- slides strings --> <!-- slides strings -->
<string name="slide1_Pilldroid">Welcome on Pilldroid</string> <string name="slide1_Pilldroid">Welcome on Pilldroid</string>
<string name="slide1_desc">The theorical Pill Stock Manager</string> <string name="slide1_desc">The theoretical Pill Stock Manager</string>
<string name="slide2_Pilldroid">To add a med, tap on the "Plus" button</string> <string name="slide2_Pilldroid">To add a med, tap on the "Plus" button</string>
<string name="slide2_desc">You\'ll add a drug to the database</string> <string name="slide2_desc">You\'ll add a drug to the database</string>
<string name="slide3_Pilldroid">You can scan classic barcode</string> <string name="slide3_Pilldroid">You can scan classic barcode</string>
@ -43,12 +43,12 @@
<string name="the_plus_icon">The plus icon</string> <string name="the_plus_icon">The plus icon</string>
<string name="slide4_desc">In order to find the CIP13</string> <string name="slide4_desc">In order to find the CIP13</string>
<string name="happy_face">Happy face</string> <string name="happy_face">Happy face</string>
<string name="barre_code_icone">Barre code icon</string> <string name="barcode_icon">Barre code icon</string>
<string name="qr_code_icon">qr-code icon</string> <string name="qr_code_icon">qr-code icon</string>
<string name="neutral_face">neutral face</string> <string name="neutral_face">neutral face</string>
<string name="unhappy_face">unhappy face</string> <string name="unhappy_face">unhappy face</string>
<string name="drug_info">Drug info screenshot</string> <string name="drug_info">Drug info screenshot</string>
<string name="tunables">Tunables</string> <string name="tunable">Tunable</string>
<string name="slide10_desc">Take to 0 to suspend treatment</string> <string name="slide10_desc">Take to 0 to suspend treatment</string>
<string name="suspended_treatment_icon">Treatment suspended icon</string> <string name="suspended_treatment_icon">Treatment suspended icon</string>
<string name="slide11_desc">To save changes</string> <string name="slide11_desc">To save changes</string>