archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix for mis-named preference strings in sync preferences in English. Also cleaned up a bit of the Producteev strings.

Browse Source
pull/14/head
Tim Su 14 years ago
parent 8c510d82a1
commit 8ca186564b
8 changed files with 65 additions and 69 deletions
Show Stats Download Patch File Download Diff File

12
astrid/plugin-src/com/todoroo/astrid/common/SyncProviderPreferences.java
Unescape Escape View File

@ -91,18 +91,18 @@ abstract public class SyncProviderPreferences extends TodorooPreferences {
if (r.getString(getUtilities().getSyncIntervalKey()).equals( if (r.getString(getUtilities().getSyncIntervalKey()).equals(
preference.getKey())) { preference.getKey())) {
int index = AndroidUtilities.indexOf( int index = AndroidUtilities.indexOf(
r.getStringArray(R.array.rmilk_MPr_interval_values), r.getStringArray(R.array.sync_SPr_interval_values),
(String) value); (String) value);
if (index <= 0) if (index <= 0)
preference.setSummary(R.string.sync_SPr_interval_desc_disabled); preference.setSummary(R.string.sync_SPr_interval_desc_disabled);
else else
preference.setSummary(r.getString( preference.setSummary(r.getString(
R.string.sync_SPr_interval_desc, R.string.sync_SPr_interval_desc,
r.getStringArray(R.array.rmilk_MPr_interval_entries)[index])); r.getStringArray(R.array.sync_SPr_interval_entries)[index]));
} }
// status // status
else if (r.getString(R.string.rmilk_MPr_status_key).equals(preference.getKey())) { else if (r.getString(R.string.sync_SPr_status_key).equals(preference.getKey())) {
boolean loggedIn = getUtilities().isLoggedIn(); boolean loggedIn = getUtilities().isLoggedIn();
String status; String status;
String subtitle = ""; //$NON-NLS-1$ String subtitle = ""; //$NON-NLS-1$
@ -168,7 +168,7 @@ abstract public class SyncProviderPreferences extends TodorooPreferences {
} }
// sync button // sync button
else if (r.getString(R.string.rmilk_MPr_sync_key).equals(preference.getKey())) { else if (r.getString(R.string.sync_SPr_sync_key).equals(preference.getKey())) {
boolean loggedIn = getUtilities().isLoggedIn(); boolean loggedIn = getUtilities().isLoggedIn();
preference.setOnPreferenceClickListener(new OnPreferenceClickListener() { preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference p) { public boolean onPreferenceClick(Preference p) {
@ -182,12 +182,12 @@ abstract public class SyncProviderPreferences extends TodorooPreferences {
} }
// log out button // log out button
else if (r.getString(R.string.rmilk_MPr_forget_key).equals(preference.getKey())) { else if (r.getString(R.string.sync_SPr_forget_key).equals(preference.getKey())) {
boolean loggedIn = getUtilities().isLoggedIn(); boolean loggedIn = getUtilities().isLoggedIn();
preference.setOnPreferenceClickListener(new OnPreferenceClickListener() { preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference p) { public boolean onPreferenceClick(Preference p) {
dialogUtilities.okCancelDialog(SyncProviderPreferences.this, dialogUtilities.okCancelDialog(SyncProviderPreferences.this,
r.getString(R.string.rmilk_forget_confirm), new OnClickListener() { r.getString(R.string.sync_forget_confirm), new OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, public void onClick(DialogInterface dialog,
int which) { int which) {

4
astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevFilterExposer.java
Unescape Escape View File

@ -32,10 +32,8 @@ import com.todoroo.astrid.producteev.sync.ProducteevTask;
*/ */
public class ProducteevFilterExposer extends BroadcastReceiver { public class ProducteevFilterExposer extends BroadcastReceiver {
@SuppressWarnings("nls")
private Filter filterFromList(Context context, ProducteevDashboard dashboard) { private Filter filterFromList(Context context, ProducteevDashboard dashboard) {
String dashboardTitle = context.getString(R.string.producteev_FEx_dashboard_item). String dashboardTitle = dashboard.getName();
replace("$N", dashboard.getName());
String title = context.getString(R.string.producteev_FEx_dashboard_title, dashboard.getName()); String title = context.getString(R.string.producteev_FEx_dashboard_title, dashboard.getName());
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put(Metadata.KEY.name, ProducteevTask.METADATA_KEY); values.put(Metadata.KEY.name, ProducteevTask.METADATA_KEY);

14
astrid/plugin-src/com/todoroo/astrid/rmilk/MilkPreferences.java
Unescape Escape View File

@ -3,8 +3,8 @@ package com.todoroo.astrid.rmilk;
import java.util.Date; import java.util.Date;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.content.Intent; import android.content.Intent;
import android.content.DialogInterface.OnClickListener;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Color; import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
@ -78,18 +78,18 @@ public class MilkPreferences extends TodorooPreferences {
if (r.getString(R.string.rmilk_MPr_interval_key).equals( if (r.getString(R.string.rmilk_MPr_interval_key).equals(
preference.getKey())) { preference.getKey())) {
int index = AndroidUtilities.indexOf( int index = AndroidUtilities.indexOf(
r.getStringArray(R.array.rmilk_MPr_interval_values), r.getStringArray(R.array.sync_SPr_interval_values),
(String) value); (String) value);
if (index <= 0) if (index <= 0)
preference.setSummary(R.string.sync_SPr_interval_desc_disabled); preference.setSummary(R.string.sync_SPr_interval_desc_disabled);
else else
preference.setSummary(r.getString( preference.setSummary(r.getString(
R.string.sync_SPr_interval_desc, R.string.sync_SPr_interval_desc,
r.getStringArray(R.array.rmilk_MPr_interval_entries)[index])); r.getStringArray(R.array.sync_SPr_interval_entries)[index]));
} }
// status // status
else if (r.getString(R.string.rmilk_MPr_status_key).equals(preference.getKey())) { else if (r.getString(R.string.sync_SPr_status_key).equals(preference.getKey())) {
boolean loggedIn = MilkUtilities.isLoggedIn(); boolean loggedIn = MilkUtilities.isLoggedIn();
String status; String status;
String subtitle = ""; //$NON-NLS-1$ String subtitle = ""; //$NON-NLS-1$
@ -155,7 +155,7 @@ public class MilkPreferences extends TodorooPreferences {
} }
// sync button // sync button
else if (r.getString(R.string.rmilk_MPr_sync_key).equals(preference.getKey())) { else if (r.getString(R.string.sync_SPr_sync_key).equals(preference.getKey())) {
boolean loggedIn = MilkUtilities.isLoggedIn(); boolean loggedIn = MilkUtilities.isLoggedIn();
preference.setOnPreferenceClickListener(new OnPreferenceClickListener() { preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference p) { public boolean onPreferenceClick(Preference p) {
@ -169,12 +169,12 @@ public class MilkPreferences extends TodorooPreferences {
} }
// log out button // log out button
else if (r.getString(R.string.rmilk_MPr_forget_key).equals(preference.getKey())) { else if (r.getString(R.string.sync_SPr_forget_key).equals(preference.getKey())) {
boolean loggedIn = MilkUtilities.isLoggedIn(); boolean loggedIn = MilkUtilities.isLoggedIn();
preference.setOnPreferenceClickListener(new OnPreferenceClickListener() { preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference p) { public boolean onPreferenceClick(Preference p) {
dialogUtilities.okCancelDialog(MilkPreferences.this, dialogUtilities.okCancelDialog(MilkPreferences.this,
r.getString(R.string.rmilk_forget_confirm), new OnClickListener() { r.getString(R.string.sync_forget_confirm), new OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, public void onClick(DialogInterface dialog,
int which) { int which) {

16
astrid/res/values/keys.xml
Unescape Escape View File

@ -178,10 +178,10 @@
<!-- default hide until setting (corresponds to entry in TEA_hideUntil) --> <!-- default hide until setting (corresponds to entry in TEA_hideUntil) -->
<string name="p_default_hideUntil_key">p_def_hide</string> <string name="p_default_hideUntil_key">p_def_hide</string>
<!-- ============================================================ MILK == --> <!-- ============================================================ SYNC == -->
<string-array name="rmilk_MPr_interval_values"> <string-array name="sync_SPr_interval_values">
<!-- rmilk_MPr_interval_values: interval in seconds for sync entries (do not edit) --> <!-- sync_SPr_interval_values: interval in seconds for sync entries (do not edit) -->
<item>0</item> <item>0</item>
<item>900</item> <item>900</item>
<item>1800</item> <item>1800</item>
@ -195,13 +195,15 @@
</string-array> </string-array>
<!-- Preference Key (do not translate) --> <!-- Preference Key (do not translate) -->
<string name="rmilk_MPr_status_key">rmilk_status</string> <string name="sync_SPr_status_key">sync_status</string>
<!-- Preference Key (do not translate) --> <!-- Preference Key (do not translate) -->
<string name="rmilk_MPr_bgwifi_key">sync_bgwifi</string> <string name="sync_SPr_bgwifi_key">sync_bgwifi</string>
<!-- Preference Key (do not translate) --> <!-- Preference Key (do not translate) -->
<string name="rmilk_MPr_sync_key">rmilk_sync</string> <string name="sync_SPr_sync_key">sync_sync</string>
<!-- Preference Key (do not translate) --> <!-- Preference Key (do not translate) -->
<string name="rmilk_MPr_forget_key">rmilk_forget</string> <string name="sync_SPr_forget_key">sync_forget</string>
<!-- ============================================================ MILK == -->
<!-- Preference Key (do not translate) --> <!-- Preference Key (do not translate) -->
<string name="rmilk_MPr_interval_key">sync_freq</string> <string name="rmilk_MPr_interval_key">sync_freq</string>

17
astrid/res/values/strings-producteev.xml
Unescape Escape View File

@ -4,23 +4,20 @@
<!-- ====================== Plugin Boilerplate ========================= --> <!-- ====================== Plugin Boilerplate ========================= -->
<!-- task detail showing Producteev dashboard information (%s => workspace name) -->
<string name="producteev_TLA_dashboard">W: %s</string>
<!-- task detail showing Producteev responsible information (%s => responsible user) -->
<string name="producteev_TLA_responsible">R: %s</string>
<!-- filters header: Producteev --> <!-- filters header: Producteev -->
<string name="producteev_FEx_header">Producteev</string> <string name="producteev_FEx_header">Producteev</string>
<!-- filter category for Producteev dashboards --> <!-- filter category for Producteev dashboards -->
<string name="producteev_FEx_dashboard">Producteev Workspaces</string> <string name="producteev_FEx_dashboard">Workspaces</string>
<!-- Producteev dashboard filter title (%s => dashboard name) -->
<string name="producteev_FEx_dashboard_title">%s</string>
<!-- Producteev dashboard filter name ($N => dashboardname, $C => count) --> <!-- filter category for Producteev responsible person -->
<string name="producteev_FEx_dashboard_item">$N</string> <string name="producteev_FEx_responsible">Assigned To</string>
<!-- Producteev dashboard filter title (%s => dashboardname) --> <!-- Producteev dashboard filter title (%s => dashboardname) -->
<string name="producteev_FEx_dashboard_title">Workspace \'%s\'</string> <string name="producteev_FEx_responsible_title">Assigned To \'%s\'</string>
<!-- ==================================================== Preferences == --> <!-- ==================================================== Preferences == -->

53
astrid/res/values/strings-rmilk.xml
Unescape Escape View File

@ -47,7 +47,7 @@
<!-- ======================== SyncPreferences ========================== --> <!-- ======================== SyncPreferences ========================== -->
<!-- RTM Status Group Label --> <!-- RTM Status Group Label -->
<string name="sync_MPr_group_status">Status</string> <string name="sync_SPr_group_status">Status</string>
<!-- Sync Status: log in --> <!-- Sync Status: log in -->
<string name="sync_status_loggedout">Not Logged In!</string> <string name="sync_status_loggedout">Not Logged In!</string>
@ -73,24 +73,41 @@
<string name="sync_SPr_interval_desc">Currently set to: %s</string> <string name="sync_SPr_interval_desc">Currently set to: %s</string>
<!-- Preference: Background Wifi Title --> <!-- Preference: Background Wifi Title -->
<string name="sync_MPr_bgwifi_title">Wifi Only Setting</string> <string name="sync_SPr_bgwifi_title">Wifi Only Setting</string>
<!-- Preference: Background Wifi Description (enabled) --> <!-- Preference: Background Wifi Description (enabled) -->
<string name="sync_MPr_bgwifi_desc_enabled">Background synchronization only happens when on Wifi</string> <string name="sync_SPr_bgwifi_desc_enabled">Background synchronization only happens when on Wifi</string>
<!-- Preference: Background Wifi Description (disabled) --> <!-- Preference: Background Wifi Description (disabled) -->
<string name="sync_MPr_bgwifi_desc_disabled">Background synchronization will always occur</string> <string name="sync_SPr_bgwifi_desc_disabled">Background synchronization will always occur</string>
<!-- Actions Group Label --> <!-- Actions Group Label -->
<string name="sync_MPr_group_actions">Actions</string> <string name="sync_SPr_group_actions">Actions</string>
<!-- Synchronize Now Button --> <!-- Synchronize Now Button -->
<string name="sync_MPr_sync">Synchronize Now!</string> <string name="sync_SPr_sync">Synchronize Now!</string>
<!-- Synchronize Now Button if not logged in--> <!-- Synchronize Now Button if not logged in-->
<string name="sync_MPr_sync_log_in">Log In &amp; Synchronize!</string> <string name="sync_SPr_sync_log_in">Log In &amp; Synchronize!</string>
<!-- Sync: Clear Data Title --> <!-- Sync: Clear Data Title -->
<string name="sync_MPr_forget">Log Out</string> <string name="sync_SPr_forget">Log Out</string>
<!-- Sync: Clear Data Description --> <!-- Sync: Clear Data Description -->
<string name="sync_MPr_forget_description">Clears all synchronization data</string> <string name="sync_SPr_forget_description">Clears all synchronization data</string>
<!-- confirmation dialog for sync log out -->
<string name="sync_forget_confirm">Log out / clear synchronization data?</string>
<string-array name="sync_SPr_interval_entries">
<!-- rmilk_MPr_interval_entries: Synchronization Intervals -->
<item>disable</item>
<item>every fifteen minutes</item>
<item>every thirty minutes</item>
<item>every hour</item>
<item>every three hours</item>
<item>every six hours</item>
<item>every twelve hours</item>
<item>every day</item>
<item>every three days</item>
<item>every week</item>
</string-array>
<!-- ======================= MilkLoginActivity ========================= --> <!-- ======================= MilkLoginActivity ========================= -->
@ -109,27 +126,9 @@ Error Message: %s
<!-- title for notification tray when synchronizing --> <!-- title for notification tray when synchronizing -->
<string name="rmilk_notification_title">Astrid: Remember the Milk</string> <string name="rmilk_notification_title">Astrid: Remember the Milk</string>
<!-- confirmation dialog for RTM log out -->
<string name="rmilk_forget_confirm">Log out / clear synchronization data?</string>
<!-- Error msg when io exception with rmilk --> <!-- Error msg when io exception with rmilk -->
<string name="rmilk_ioerror">Connection Error! Check your Internet connection, <string name="rmilk_ioerror">Connection Error! Check your Internet connection,
or maybe RTM servers (status.rememberthemilk.com), for possible solutions.</string> or maybe RTM servers (status.rememberthemilk.com), for possible solutions.</string>
<string-array name="rmilk_MPr_interval_entries">
<!-- rmilk_MPr_interval_entries: Synchronization Intervals -->
<item>disable</item>
<item>every fifteen minutes</item>
<item>every thirty minutes</item>
<item>every hour</item>
<item>every three hours</item>
<item>every six hours</item>
<item>every twelve hours</item>
<item>every day</item>
<item>every three days</item>
<item>every week</item>
</string-array>
</resources> </resources>

8
astrid/res/xml/preferences_producteev.xml
Unescape Escape View File

@ -7,7 +7,7 @@
<Preference <Preference
android:layout="@layout/status_preference" android:layout="@layout/status_preference"
android:key="@string/rmilk_MPr_status_key" android:key="@string/sync_SPr_status_key"
android:textSize="24sp" android:textSize="24sp"
android:gravity="center"/> android:gravity="center"/>
@ -19,7 +19,7 @@
<ListPreference <ListPreference
android:key="@string/producteev_PPr_interval_key" android:key="@string/producteev_PPr_interval_key"
android:entries="@array/sync_SPr_interval_entries" android:entries="@array/sync_SPr_interval_entries"
android:entryValues="@array/rmilk_MPr_interval_values" android:entryValues="@array/sync_SPr_interval_values"
android:title="@string/sync_SPr_interval_title" /> android:title="@string/sync_SPr_interval_title" />
<ListPreference <ListPreference
@ -31,11 +31,11 @@
<PreferenceCategory <PreferenceCategory
android:title="@string/sync_SPr_group_actions"> android:title="@string/sync_SPr_group_actions">
<Preference <Preference
android:key="@string/rmilk_MPr_sync_key" android:key="@string/sync_SPr_sync_key"
android:title="@string/sync_SPr_sync" /> android:title="@string/sync_SPr_sync" />
<Preference <Preference
android:key="@string/rmilk_MPr_forget_key" android:key="@string/sync_SPr_forget_key"
android:title="@string/sync_SPr_forget" android:title="@string/sync_SPr_forget"
android:summary="@string/sync_SPr_forget_description" /> android:summary="@string/sync_SPr_forget_description" />
</PreferenceCategory> </PreferenceCategory>

8
astrid/res/xml/preferences_rmilk.xml
Unescape Escape View File

@ -7,7 +7,7 @@
<Preference <Preference
android:layout="@layout/status_preference" android:layout="@layout/status_preference"
android:key="@string/rmilk_MPr_status_key" android:key="@string/sync_SPr_status_key"
android:textSize="24sp" android:textSize="24sp"
android:gravity="center"/> android:gravity="center"/>
@ -19,7 +19,7 @@
<ListPreference <ListPreference
android:key="@string/rmilk_MPr_interval_key" android:key="@string/rmilk_MPr_interval_key"
android:entries="@array/sync_SPr_interval_entries" android:entries="@array/sync_SPr_interval_entries"
android:entryValues="@array/rmilk_MPr_interval_values" android:entryValues="@array/sync_SPr_interval_values"
android:title="@string/sync_SPr_interval_title" /> android:title="@string/sync_SPr_interval_title" />
</PreferenceCategory> </PreferenceCategory>
@ -28,11 +28,11 @@
android:title="@string/sync_SPr_group_actions"> android:title="@string/sync_SPr_group_actions">
<Preference <Preference
android:key="@string/rmilk_MPr_sync_key" android:key="@string/sync_SPr_sync_key"
android:title="@string/sync_SPr_sync" /> android:title="@string/sync_SPr_sync" />
<Preference <Preference
android:key="@string/rmilk_MPr_forget_key" android:key="@string/sync_SPr_forget_key"
android:title="@string/sync_SPr_forget" android:title="@string/sync_SPr_forget"
android:summary="@string/sync_SPr_forget_description" /> android:summary="@string/sync_SPr_forget_description" />

Write Preview
Loading…
Cancel
Save