Skip to content

Commit

Permalink
Translate '/opensrp-immunization/src/main/res/values/strings.xml' in …
Browse files Browse the repository at this point in the history
…'fr' (#160)

* Apply translations in fr

translation completed for the source file '/opensrp-immunization/src/main/res/values/strings.xml'
on the 'fr' language.

* Fix failing test ServiceRowGroupTest#assertConstructorsNotNull

* Fix other failing tests

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com>
  • Loading branch information
transifex-integration[bot] and ellykits committed Feb 12, 2021
1 parent b55aaee commit a194fdb
Show file tree
Hide file tree
Showing 20 changed files with 110 additions and 107 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
import android.annotation.SuppressLint;
import android.content.DialogInterface;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import androidx.appcompat.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;

import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;

import org.smartregister.immunization.R;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import android.graphics.Point;
import android.os.Bundle;
import android.os.Handler;
import androidx.fragment.app.DialogFragment;
import android.view.Display;
import android.view.Gravity;
import android.view.LayoutInflater;
Expand All @@ -22,6 +21,8 @@
import android.widget.TextView;
import android.widget.Toast;

import androidx.fragment.app.DialogFragment;

import com.vijay.jsonwizard.utils.NativeFormsProperties;

import org.apache.commons.lang3.StringUtils;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import android.graphics.Point;
import android.os.Bundle;
import android.os.Handler;
import androidx.fragment.app.DialogFragment;
import android.view.Display;
import android.view.Gravity;
import android.view.LayoutInflater;
Expand All @@ -22,6 +21,8 @@
import android.widget.TextView;
import android.widget.Toast;

import androidx.fragment.app.DialogFragment;

import com.vijay.jsonwizard.utils.NativeFormsProperties;

import org.apache.commons.lang3.StringUtils;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import android.graphics.Point;
import android.os.Bundle;
import android.os.Handler;
import androidx.fragment.app.DialogFragment;
import android.view.Display;
import android.view.Gravity;
import android.view.LayoutInflater;
Expand All @@ -18,6 +17,8 @@
import android.widget.ImageView;
import android.widget.TextView;

import androidx.fragment.app.DialogFragment;

import org.smartregister.immunization.R;
import org.smartregister.immunization.domain.ServiceWrapper;
import org.smartregister.immunization.listener.ServiceActionListener;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import android.graphics.Point;
import android.os.Bundle;
import android.os.Handler;
import androidx.fragment.app.DialogFragment;
import android.view.Display;
import android.view.Gravity;
import android.view.LayoutInflater;
Expand All @@ -18,6 +17,8 @@
import android.widget.ImageView;
import android.widget.TextView;

import androidx.fragment.app.DialogFragment;

import org.smartregister.immunization.R;
import org.smartregister.immunization.db.VaccineRepo;
import org.smartregister.immunization.domain.VaccineWrapper;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
import android.graphics.Point;
import android.os.Bundle;
import android.os.Handler;
import androidx.fragment.app.DialogFragment;

import android.util.Pair;
import android.view.Display;
import android.view.Gravity;
Expand All @@ -25,6 +23,8 @@
import android.widget.TextView;
import android.widget.Toast;

import androidx.fragment.app.DialogFragment;

import com.vijay.jsonwizard.customviews.CheckBox;
import com.vijay.jsonwizard.customviews.RadioButton;
import com.vijay.jsonwizard.utils.NativeFormsProperties;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
import android.graphics.Point;
import android.os.Bundle;
import android.os.Handler;
import androidx.fragment.app.DialogFragment;

import android.util.Pair;
import android.view.Display;
import android.view.Gravity;
Expand All @@ -24,6 +22,8 @@
import android.widget.TextView;
import android.widget.Toast;

import androidx.fragment.app.DialogFragment;

import com.vijay.jsonwizard.utils.NativeFormsProperties;

import org.apache.commons.lang3.StringUtils;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.smartregister.immunization.job;

import android.content.Intent;

import androidx.annotation.NonNull;

import org.smartregister.AllConstants;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package org.smartregister.immunization.job;

import android.content.Intent;
import android.text.TextUtils;

import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import android.text.TextUtils;

import com.evernote.android.job.DailyJob;
import com.evernote.android.job.JobRequest;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.smartregister.immunization.job;

import android.content.Intent;

import androidx.annotation.NonNull;

import org.smartregister.AllConstants;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

import android.app.IntentService;
import android.content.Intent;
import android.text.TextUtils;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import android.text.TextUtils;

import org.joda.time.DateTime;
import org.smartregister.CoreLibrary;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

import android.app.Activity;
import android.content.res.Configuration;
import androidx.annotation.NonNull;
import android.text.TextUtils;
import android.util.Log;

import androidx.annotation.NonNull;

import org.apache.commons.lang3.StringUtils;
import org.smartregister.CoreLibrary;
import org.smartregister.immunization.ImmunizationLibrary;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@

import android.content.Context;
import android.graphics.Color;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentTransaction;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.TableLayout;
import android.widget.TableRow;
import android.widget.TextView;

import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentTransaction;

import com.google.gson.Gson;

import org.apache.commons.lang3.StringUtils;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@
import android.content.res.AssetManager;
import android.content.res.Resources;
import android.graphics.Color;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentTransaction;

import android.text.Html;
import android.text.TextUtils;
import android.util.Log;
Expand All @@ -43,6 +36,12 @@
import android.widget.TableRow;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentTransaction;

import com.google.gson.reflect.TypeToken;

import org.apache.commons.lang3.StringUtils;
Expand Down
6 changes: 3 additions & 3 deletions opensrp-immunization/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
<string name="activate_child_status_dialog_message">l\'Activation de l\'enfant va relancer l\'horaire de service de l\'application et vous permettra d\'enregistrer les services.</string>
<string name="make_active">Activer</string>


<!-- Immunization Names-->
<string name="bcg">BCG</string>
<string name="hepb">HepB à la naissance</string>
Expand All @@ -73,6 +72,8 @@
<string name="mr_2">RR 2</string>
<string name="vit_a_1">Vit A 6 Mois</string>
<string name="vit_a_2">Vit A 12 Mois</string>


<string name="at_birth">Naissance</string>
<string name="_6_weeks">6 Semaines</string>
<string name="_10_weeks">10 Semaines</string>
Expand All @@ -84,5 +85,4 @@
<string name="expired_colon">Expiré: %1$s</string>
<string name="out_of_catchment">Hors de la zone sanitaire</string>


</resources>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.smartregister.immunization.domain.VaccineWrapper;
import org.smartregister.immunization.repository.VaccineRepository;
import org.smartregister.immunization.view.mock.ImmunizationRowGroupTestActivity;
import org.smartregister.repository.AllSharedPreferences;
import org.smartregister.util.JsonFormUtils;

import java.lang.reflect.Type;
Expand Down Expand Up @@ -67,7 +68,13 @@ public class ImmunizationRowGroupTest extends BaseUnitTest {
private AttributeSet attrs;

@Mock
private org.smartregister.Context context_;
private org.smartregister.Context openSRPContext;

@Mock
private CoreLibrary coreLibrary;

@Mock
private AllSharedPreferences allSharedPreferences;

private org.smartregister.immunization.domain.jsonmapping.VaccineGroup vaccineData;
private CommonPersonObjectClient childdetails;
Expand All @@ -84,7 +91,9 @@ public void setUp() {
Intent intent = new Intent(RuntimeEnvironment.application, ImmunizationRowGroupTestActivity.class);
controller = Robolectric.buildActivity(ImmunizationRowGroupTestActivity.class, intent);
activity = controller.start().resume().get();
CoreLibrary.init(context_);
ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary);
Mockito.when(coreLibrary.context()).thenReturn(openSRPContext);
Mockito.doReturn(allSharedPreferences).when(openSRPContext).allSharedPreferences();
controller.setup();
view = activity.getInstance();

Expand Down Expand Up @@ -419,6 +428,7 @@ public void tearDown() {
controller = null;

ReflectionHelpers.setStaticField(ImmunizationLibrary.class, "instance", null);
ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.smartregister.immunization.domain.State;
import org.smartregister.immunization.util.IMConstants;
import org.smartregister.immunization.view.mock.ServiceCardTestActivity;
import org.smartregister.repository.AllSharedPreferences;
import org.smartregister.repository.Repository;
import org.smartregister.util.AppProperties;

Expand All @@ -46,15 +47,23 @@ public class ServiceCardTest extends BaseUnitTest {
@InjectMocks
private ServiceCardTestActivity activity;
@Mock
private org.smartregister.Context context_;
private org.smartregister.Context openSRPContext;

@Mock
private CoreLibrary coreLibrary;

@Mock
private AllSharedPreferences allSharedPreferences;

@Before
public void setUp() {
org.mockito.MockitoAnnotations.initMocks(this);
Intent intent = new Intent(RuntimeEnvironment.application, ServiceCardTestActivity.class);
controller = Robolectric.buildActivity(ServiceCardTestActivity.class, intent);
activity = controller.start().resume().get();
CoreLibrary.init(context_);
ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary);
Mockito.when(coreLibrary.context()).thenReturn(openSRPContext);
Mockito.doReturn(allSharedPreferences).when(openSRPContext).allSharedPreferences();
controller.setup();
view = activity.getInstance();

Expand Down Expand Up @@ -140,31 +149,15 @@ public void assertgetStateCallsUpdateStateReturnsWrapperState() {
Assert.assertEquals(view.getState(), State.DONE_CAN_BE_UNDONE);
}

@Test
public void assertConstructorsNotNull() {
Assert.assertNotNull(activity.getInstance());
//Assert.assertNotNull(activity.getInstance1());
//Assert.assertNotNull(activity.getInstance2());
//Assert.assertNotNull(activity.getInstance3());
}

@Test
public void testConstructors() {
Assert.assertNotNull(new ServiceCard(RuntimeEnvironment.application));
Assert.assertNotNull(new ServiceCard(RuntimeEnvironment.application, Robolectric.buildAttributeSet().build()));
Assert.assertNotNull(new ServiceCard(RuntimeEnvironment.application, Robolectric.buildAttributeSet().build(), 0));
Assert.assertNotNull(new ServiceCard(RuntimeEnvironment.application, Robolectric.buildAttributeSet().build(), 0, 0));
}

@Test
public void testHideVaccineOverdueVaccineCardColor() {
ReflectionHelpers.setStaticField(ImmunizationLibrary.class, "instance", null);

AppProperties appProperties = Mockito.mock(AppProperties.class);
Mockito.when(appProperties.hasProperty(IMConstants.APP_PROPERTIES.HIDE_OVERDUE_VACCINE_STATUS)).thenReturn(true);
Mockito.when(appProperties.getPropertyBoolean(IMConstants.APP_PROPERTIES.HIDE_OVERDUE_VACCINE_STATUS)).thenReturn(true);
Mockito.when(context_.getAppProperties()).thenReturn(appProperties);
ImmunizationLibrary.init(context_, Mockito.mock(Repository.class), null, BuildConfig.VERSION_CODE, 1);
Mockito.when(openSRPContext.getAppProperties()).thenReturn(appProperties);
ImmunizationLibrary.init(openSRPContext, Mockito.mock(Repository.class), null, BuildConfig.VERSION_CODE, 1);

Alert alert = new Alert("", "", "", AlertStatus.urgent, "", "");
ServiceWrapper wrapper = new ServiceWrapper();
Expand Down Expand Up @@ -201,8 +194,8 @@ public void testShowVaccineOverdueVaccineCardColor() {
AppProperties appProperties = Mockito.mock(AppProperties.class);
Mockito.when(appProperties.hasProperty(IMConstants.APP_PROPERTIES.HIDE_OVERDUE_VACCINE_STATUS)).thenReturn(false);
Mockito.when(appProperties.getPropertyBoolean(IMConstants.APP_PROPERTIES.HIDE_OVERDUE_VACCINE_STATUS)).thenReturn(false);
Mockito.when(context_.getAppProperties()).thenReturn(appProperties);
ImmunizationLibrary.init(context_, Mockito.mock(Repository.class), null, BuildConfig.VERSION_CODE, 1);
Mockito.when(openSRPContext.getAppProperties()).thenReturn(appProperties);
ImmunizationLibrary.init(openSRPContext, Mockito.mock(Repository.class), null, BuildConfig.VERSION_CODE, 1);

Alert alert = new Alert("", "", "", AlertStatus.urgent, "", "");
ServiceWrapper wrapper = new ServiceWrapper();
Expand Down Expand Up @@ -236,7 +229,7 @@ public void tearDown() {
destroyController();
activity = null;
controller = null;

ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);
}

private void destroyController() {
Expand Down
Loading

0 comments on commit a194fdb

Please sign in to comment.