diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ff02d34..4cc8635 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -78,17 +78,17 @@ diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index 8527069..d29f210 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -1,7 +1,7 @@ - Georgian for us, by us - Phrase + Learn Mi\'kmaq + Dialog diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 3827dbf..d29f210 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -1,7 +1,7 @@ - Learn Georgian Together - Phrase + Learn Mi\'kmaq + Dialog diff --git a/res/values/strings.xml b/res/values/strings.xml index fc98d5a..d29f210 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,7 +1,7 @@ - ქართული ერთად - ფრაზა + Learn Mi\'kmaq + Dialog diff --git a/src/com/github/opensourcefieldlinguistics/fielddb/FieldDBApplication.java b/src/com/github/opensourcefieldlinguistics/fielddb/FieldDBApplication.java index 99efcbe..21bfc9a 100644 --- a/src/com/github/opensourcefieldlinguistics/fielddb/FieldDBApplication.java +++ b/src/com/github/opensourcefieldlinguistics/fielddb/FieldDBApplication.java @@ -18,7 +18,7 @@ import com.github.opensourcefieldlinguistics.fielddb.database.FieldDBUserContentProvider; import com.github.opensourcefieldlinguistics.fielddb.lessons.Config; -import com.github.opensourcefieldlinguistics.fielddb.lessons.georgian.R; +import com.github.opensourcefieldlinguistics.fielddb.lessons.R; import com.github.opensourcefieldlinguistics.fielddb.service.DownloadDatumsService; import com.github.opensourcefieldlinguistics.fielddb.service.RegisterUserService; diff --git a/src/com/github/opensourcefieldlinguistics/fielddb/lessons/Config.java b/src/com/github/opensourcefieldlinguistics/fielddb/lessons/Config.java index 376cf60..375b6fa 100644 --- a/src/com/github/opensourcefieldlinguistics/fielddb/lessons/Config.java +++ b/src/com/github/opensourcefieldlinguistics/fielddb/lessons/Config.java @@ -5,10 +5,10 @@ public class Config extends ca.ilanguage.oprime.Config { public static final String ACRA_PASS = PrivateConstants.ACRA_PASS; public static final String ACRA_SERVER_URL = PrivateConstants.ACRA_SERVER_URL; public static final String ACRA_USER = PrivateConstants.ACRA_USER; - public static final String DATA_IS_ABOUT_LANGUAGE_ISO = "ka"; - public static final String DATA_IS_ABOUT_LANGUAGE_NAME = "ქართული"; + public static final String DATA_IS_ABOUT_LANGUAGE_ISO = "mic"; + public static final String DATA_IS_ABOUT_LANGUAGE_NAME = "Migmaq"; - public static final String DEFAULT_CORPUS = "community-georgian"; + public static final String DEFAULT_CORPUS = "community-migmaq"; public static final String DEFAULT_DATA_LOGIN = PrivateConstants.DEFAULT_DATA_SERVER_URL + "/_session"; public static final String DEFAULT_AUTH_LOGIN_URL = PrivateConstants.DEFAULT_AUTH_LOGIN_URL; @@ -21,5 +21,5 @@ public class Config extends ca.ilanguage.oprime.Config { + "/" + DEFAULT_CORPUS + "/_design/learnx/_view/byTag"; public static final String KEYSTORE_PASS = PrivateConstants.KEYSTORE_PASS; - public static final String USER_FRIENDLY_DATA_NAME = "ფრაზა"; + public static final String USER_FRIENDLY_DATA_NAME = "Dialog"; } diff --git a/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumDetailActivity.java b/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumDetailActivity.java index f965bb3..12d5b1b 100644 --- a/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumDetailActivity.java +++ b/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumDetailActivity.java @@ -1,6 +1,6 @@ package com.github.opensourcefieldlinguistics.fielddb.lessons.ui; -import com.github.opensourcefieldlinguistics.fielddb.lessons.georgian.R; +import com.github.opensourcefieldlinguistics.fielddb.lessons.R; import android.content.Intent; import android.os.Bundle; diff --git a/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumDetailFragment.java b/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumDetailFragment.java index e96dd16..9ff4ab6 100644 --- a/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumDetailFragment.java +++ b/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumDetailFragment.java @@ -38,7 +38,7 @@ import com.github.opensourcefieldlinguistics.fielddb.database.DatumContentProvider; import com.github.opensourcefieldlinguistics.fielddb.database.DatumContentProvider.DatumTable; import com.github.opensourcefieldlinguistics.fielddb.lessons.Config; -import com.github.opensourcefieldlinguistics.fielddb.lessons.georgian.R; +import com.github.opensourcefieldlinguistics.fielddb.lessons.R; import com.github.opensourcefieldlinguistics.fielddb.model.Datum; /** diff --git a/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumListActivity.java b/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumListActivity.java index ca449b1..6fe1f90 100644 --- a/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumListActivity.java +++ b/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumListActivity.java @@ -1,7 +1,7 @@ package com.github.opensourcefieldlinguistics.fielddb.lessons.ui; import com.github.opensourcefieldlinguistics.fielddb.database.DatumContentProvider; -import com.github.opensourcefieldlinguistics.fielddb.lessons.georgian.R; +import com.github.opensourcefieldlinguistics.fielddb.lessons.R; import android.content.Intent; import android.net.Uri; diff --git a/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumListFragment.java b/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumListFragment.java index e1c1a32..9275d8e 100644 --- a/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumListFragment.java +++ b/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumListFragment.java @@ -20,7 +20,7 @@ import com.github.opensourcefieldlinguistics.fielddb.database.DatumContentProvider.DatumTable; import com.github.opensourcefieldlinguistics.fielddb.database.DatumContentProvider; -import com.github.opensourcefieldlinguistics.fielddb.lessons.georgian.R; +import com.github.opensourcefieldlinguistics.fielddb.lessons.R; /** * A list fragment representing a list of Datums. This fragment also supports diff --git a/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumRowArrayAdapter.java b/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumRowArrayAdapter.java index 1e7f3d6..3a86f88 100644 --- a/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumRowArrayAdapter.java +++ b/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumRowArrayAdapter.java @@ -2,7 +2,7 @@ import java.util.List; -import com.github.opensourcefieldlinguistics.fielddb.lessons.georgian.R; +import com.github.opensourcefieldlinguistics.fielddb.lessons.R; import com.github.opensourcefieldlinguistics.fielddb.model.Datum; import android.content.Context; diff --git a/src/com/github/opensourcefieldlinguistics/fielddb/service/DownloadDatumsService.java b/src/com/github/opensourcefieldlinguistics/fielddb/service/DownloadDatumsService.java index fbc78c3..04e0434 100644 --- a/src/com/github/opensourcefieldlinguistics/fielddb/service/DownloadDatumsService.java +++ b/src/com/github/opensourcefieldlinguistics/fielddb/service/DownloadDatumsService.java @@ -19,7 +19,7 @@ import com.github.opensourcefieldlinguistics.fielddb.database.AudioVideoContentProvider.AudioVideoTable; import com.github.opensourcefieldlinguistics.fielddb.database.DatumContentProvider.DatumTable; import com.github.opensourcefieldlinguistics.fielddb.lessons.Config; -import com.github.opensourcefieldlinguistics.fielddb.lessons.georgian.R; +import com.github.opensourcefieldlinguistics.fielddb.lessons.R; import com.google.gson.JsonArray; import com.google.gson.JsonObject; diff --git a/src/com/github/opensourcefieldlinguistics/fielddb/service/RegisterUserService.java b/src/com/github/opensourcefieldlinguistics/fielddb/service/RegisterUserService.java index c49f6d5..7ba8327 100644 --- a/src/com/github/opensourcefieldlinguistics/fielddb/service/RegisterUserService.java +++ b/src/com/github/opensourcefieldlinguistics/fielddb/service/RegisterUserService.java @@ -14,7 +14,7 @@ import com.github.opensourcefieldlinguistics.fielddb.database.FieldDBUserContentProvider; import com.github.opensourcefieldlinguistics.fielddb.lessons.Config; -import com.github.opensourcefieldlinguistics.fielddb.lessons.georgian.R; +import com.github.opensourcefieldlinguistics.fielddb.lessons.R; import com.google.gson.JsonObject; import android.app.NotificationManager;