Suunto App Modifications per code review (#301)

* Suunto App Integration * Readme update * Suunto App logo with transparent background * Clean-up * Renaming Cloud Connectivity to Cloud * Info * date * Better naming * renaming * Streams! * Better explanation * Mnemonic * Name * Misc * last cleanup * Improvements * Displaying a message when renewing the token * Suunto App Integration (#299) * Suunto App Integration * Readme update * Suunto App logo with transparent background * Clean-up * Renaming Cloud Connectivity to Cloud * Info * date * Better naming * renaming * Streams! * Better explanation * Mnemonic * Name * Misc * last cleanup * Improvements * Displaying a message when renewing the token * Per code review * Fix * UI * per code review * Improvements * Icon_ should have 2 __ to group them together -> Icon__ * Javadoc * Manually sorting the fields * More readable * Renaming * Restructuring the text keys for more clarity * Misc * Placing the translation files in 1 place only * Typo * For tours without time data, we use the camouflage speed for a successful upload * Typo * French translation * Fixing a bug when uploading manual tours to Strava where the time would be wrong * Updating the FIT SDK from 21.40 to 21.47 * Per code review * Readme update * Validating the tokens when uploading a route * Not needed
mytourbook · Feb 20, 2021 · 01a0cfd · 01a0cfd
1 parent 79dbc6a
commit 01a0cfd
Show file tree

Hide file tree

Showing 45 changed files with 726 additions and 770 deletions.
diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/Messages.java b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/Messages.java
@@ -21,8 +21,10 @@ public class Messages extends NLS {
 
    private static final String BUNDLE_NAME = "net.tourbook.cloud.messages";   //$NON-NLS-1$
 
-   public static String        Html_CloseBrowser_Text;
+   public static String        Icon__Check;
+   public static String        Icon__Hourglass;
 
+   public static String        Html_CloseBrowser_Text;
    public static String        Log_CloudAction_End;
    public static String        Log_CloudAction_InvalidTokens;
 
@@ -35,8 +37,67 @@ public class Messages extends NLS {
    public static String        Pref_CloudConnectivity_UnavailablePort_Title;
    public static String        Pref_CloudConnectivity_WebPage_Label;
 
-   public static String        Icon_Check;
-   public static String        Icon_Hourglass;
+   //DROPBOX
+   public static String Image__Dropbox_File;
+   public static String Image__Dropbox_Folder;
+   public static String Image__Dropbox_Logo;
+   public static String Image__Dropbox_Parentfolder;
+
+   public static String Dialog_DropboxBrowser_Button_ParentFolder_Tooltip;
+   public static String Dialog_DropboxBrowser_Button_SelectFolder;
+   public static String Dialog_DropboxBrowser_Text_AbsolutePath_Tooltip;
+   public static String Dialog_DropboxFolderChooser_Area_Text;
+   public static String Dialog_DropboxFolderChooser_Area_Title;
+   public static String Pref_CloudConnectivity_Dropbox_AccessToken_Tooltip;
+   public static String Pref_CloudConnectivity_Dropbox_WebPage_Link;
+
+   //SUUNTO
+   public static String Image__SuuntoApp_Icon;
+
+   public static String Dialog_UploadRoutes_Message;
+   public static String Dialog_UploadRoutes_SubTask;
+   public static String Dialog_UploadRoutes_Task;
+   public static String Dialog_UploadRoutes_Title;
+   public static String Dialog_DownloadWorkouts_Message;
+   public static String Dialog_DownloadWorkouts_SubTask;
+   public static String Dialog_DownloadWorkouts_Task;
+   public static String Dialog_DownloadWorkouts_Title;
+   public static String Log_DownloadWorkoutsToSuunto_001_Start;
+   public static String Log_DownloadWorkoutsToSuunto_002_NewWorkoutsNotFound;
+   public static String Log_DownloadWorkoutsToSuunto_003_AllWorkoutsAlreadyExist;
+   public static String Log_DownloadWorkoutsToSuunto_004_NoSpecifiedFolder;
+   public static String Log_DownloadWorkoutsToSuunto_005_DownloadStatus;
+   public static String Log_DownloadWorkoutsToSuunto_006_FileAlreadyExists;
+   public static String Log_DownloadWorkoutsToSuunto_007_Error;
+   public static String Log_UploadToursToSuunto_001_Start;
+   public static String Log_UploadToursToSuunto_002_NoGpsCoordinate;
+   public static String Log_UploadToursToSuunto_003_UploadStatus;
+   public static String Log_UploadToursToSuunto_004_UploadError;
+   public static String Pref_AccountInformation_SuuntoApp_WebPage_Link;
+   public static String Pref_Checkbox_Use_SinceDateFilter;
+   public static String Pref_Checkbox_Use_SinceDateFilter_Tooltip;
+   public static String Pref_Combo_Workouts_FolderPath_Combo_Tooltip;
+   public static String Pref_Combo_Workouts_Label_FolderPath;
+   public static String Suunto_Workouts_Description;
+   public static String ValidatingSuuntoTokens_SubTask;
+   public static String VendorName_Suunto_Routes;
+   public static String VendorName_Suunto_Workouts;
+
+   //STRAVA
+   public static String Image__Connect_With_Strava;
+
+   public static String Dialog_UploadTours_Message;
+   public static String Dialog_UploadTours_SubTask;
+   public static String Dialog_UploadTours_Task;
+   public static String Dialog_UploadTours_Title;
+   public static String Log_UploadToursToStrava_001_Start;
+   public static String Log_UploadToursToStrava_002_NoTourTitle;
+   public static String Log_UploadToursToStrava_003_ActivityLink;
+   public static String Log_UploadToursToStrava_003_UploadStatus;
+   public static String Log_UploadToursToStrava_004_UploadError;
+   public static String PrefPage_Account_Information_Label_AthleteName;
+   public static String PrefPage_Account_Information_Label_AthleteWebPage;
+   public static String VendorName_Strava;
 
    static {
       NLS.initializeMessages(BUNDLE_NAME, Messages.class);

diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/DialogDropboxFolderBrowser.java b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/DialogDropboxFolderBrowser.java
@@ -26,6 +26,7 @@
 
 import net.tourbook.application.TourbookPlugin;
 import net.tourbook.cloud.Activator;
+import net.tourbook.cloud.Messages;
 import net.tourbook.common.CommonActivator;
 import net.tourbook.common.UI;
 import net.tourbook.common.util.StringUtils;

diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/DropboxFileSystem.java b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/DropboxFileSystem.java
@@ -29,6 +29,7 @@
 import java.util.Map;
 
 import net.tourbook.cloud.Activator;
+import net.tourbook.cloud.Messages;
 import net.tourbook.cloud.Preferences;
 import net.tourbook.common.TourbookFileSystem;
 import net.tourbook.common.UI;

diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/Messages.java b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/Messages.java
diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/PrefPageDropbox.java b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/PrefPageDropbox.java
@@ -23,6 +23,7 @@
 import java.util.Base64;
 
 import net.tourbook.cloud.Activator;
+import net.tourbook.cloud.Messages;
 import net.tourbook.cloud.Preferences;
 import net.tourbook.cloud.oauth2.LocalHostServer;
 import net.tourbook.cloud.oauth2.OAuth2Constants;

diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/messages.properties b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/messages.properties
diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/messages_cs.properties b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/messages_cs.properties
diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/messages_de.properties b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/messages_de.properties
diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/messages_es.properties b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/messages_es.properties
diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/messages_fr.properties b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/messages_fr.properties
diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/messages_it.properties b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/messages_it.properties
diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/messages_nl.properties b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/messages_nl.properties
diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/messages.properties b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/messages.properties
@@ -2,9 +2,9 @@
 
 Html_CloseBrowser_Text = You can now close this browser's window
 
-Icon_Check = \u2705 
+Icon__Check=\u2705 
 
-Icon_Hourglass = \u231B
+Icon__Hourglass=\u231B
 
 Log_CloudAction_End           = Performed in %.3f s
 Log_CloudAction_InvalidTokens = Action aborted due to invalid tokens
@@ -17,3 +17,87 @@ Pref_CloudConnectivity_RefreshToken_Label      = Refresh token
 Pref_CloudConnectivity_UnavailablePort_Message = The port {0} necessary to retrieve the {1} token is unavailable or already in use.
 Pref_CloudConnectivity_UnavailablePort_Title   = Port Unavailable
 Pref_CloudConnectivity_WebPage_Label           = Web page
+
+Dialog_DownloadWorkouts_Message = Downloaded workouts: {0}\n\
+                                  Workouts with errors: {1}
+Dialog_DownloadWorkouts_SubTask = {0} Retrieving the list of new workouts: {1}\n\
+                                  {2} Downloading the workouts
+Dialog_DownloadWorkouts_Title=Suunto App Workouts Download Summary
+Dialog_DownloadWorkouts_Task    = Downloading workouts from Suunto App
+
+Dialog_UploadRoutes_Message = Uploaded tours: {0}\n\
+                              Tours with errors: {1}
+Dialog_UploadRoutes_SubTask = {0} Routes Preparation\n\
+                              {1} Upload
+Dialog_UploadRoutes_Title=Suunto App Routes Upload Summary
+Dialog_UploadRoutes_Task    = Uploading {0} tours as Suunto Routes
+
+Image__SuuntoApp_Icon = SuuntoAppIcon.png
+
+Log_DownloadWorkoutsToSuunto_001_Start                   = Retrieving Workouts From Suunto App
+Log_DownloadWorkoutsToSuunto_002_NewWorkoutsNotFound     = No new workouts were found in Suunto App
+Log_DownloadWorkoutsToSuunto_003_AllWorkoutsAlreadyExist = 0 workouts to be downloaded: All the workouts found in Suunto App already exist in the database
+Log_DownloadWorkoutsToSuunto_004_NoSpecifiedFolder       = A destination folder need be specified to download the new workouts from Suunto App
+Log_DownloadWorkoutsToSuunto_005_DownloadStatus          = {0} -> Workout Downloaded to the file: "{1}"
+Log_DownloadWorkoutsToSuunto_006_FileAlreadyExists       = {0} -> The following file already exists at the location: "{1}"
+Log_DownloadWorkoutsToSuunto_007_Error                   = The following error occurred when retrieving the workout of Id {0}: {1}
+
+Log_UploadToursToSuunto_001_Start           = Uploading {0} Routes to Suunto App
+Log_UploadToursToSuunto_002_NoGpsCoordinate = {0} -> GPS coordinates are missing
+Log_UploadToursToSuunto_003_UploadStatus    = {0} -> Uploaded Route Id: "{1}"
+Log_UploadToursToSuunto_004_UploadError     = {0} -> Error while uploading the route: "{1}"
+
+Pref_AccountInformation_SuuntoApp_WebPage_Link = https://www.suunto.com/suunto-app/suunto-app/
+
+Pref_Checkbox_Use_SinceDateFilter         = &Use a date filter
+Pref_Checkbox_Use_SinceDateFilter_Tooltip = Only workouts for which the start date is greater than this date will be downloaded
+
+Pref_Combo_Workouts_FolderPath_Combo_Tooltip = This is the folder where the new workout files will be downloaded to
+Pref_Combo_Workouts_Label_FolderPath         = Download &folder
+
+Suunto_Workouts_Description = Download workouts from a Suunto App account
+
+ValidatingSuuntoTokens_SubTask = \u231B Validating the Suunto App tokens
+
+VendorName_Suunto_Routes   = S&uunto App (Routes)
+VendorName_Suunto_Workouts = Suunto App
+
+
+Dialog_UploadTours_Message=Uploaded tours: {0}\n\
+                              Tours with errors: {1}
+Dialog_UploadTours_Title=Strava Tour Upload Summary
+
+Image__Connect_With_Strava = btn_strava_connectwith_light.png
+
+Log_UploadToursToStrava_001_Start        = Uploading {0} tours to Strava
+Log_UploadToursToStrava_002_NoTourTitle  = {0} -> Tour title is missing
+Log_UploadToursToStrava_003_ActivityLink = {0} -> Uploaded Activity Link: <br><a href="https://www.strava.com/activities/{1}">https://www.strava.com/activities/{1}</a></br>
+Log_UploadToursToStrava_003_UploadStatus = {0} -> Upload Id: "{1}". Creation Activity Status: "{2}"
+Log_UploadToursToStrava_004_UploadError  = {0} -> Error while uploading the tour: "{1}"
+
+PrefPage_Account_Information_Label_AthleteName=Athlete's name
+PrefPage_Account_Information_Label_AthleteWebPage=Athlete's web page
+
+Dialog_UploadTours_SubTask={0} Tour Preparation\n\
+                              {1} Upload
+
+Dialog_UploadTours_Task=Uploading {0} tours to Strava ({1})
+
+VendorName_Strava = &Strava
+
+
+Dialog_DropboxBrowser_Button_ParentFolder_Tooltip = Go to the parent folder
+Dialog_DropboxBrowser_Button_SelectFolder         = &Select Folder
+Dialog_DropboxBrowser_Text_AbsolutePath_Tooltip   = Current folder's absolute path
+
+Dialog_DropboxFolderChooser_Area_Text  = Choose a Dropbox Folder that will be accessed by MyTourbook to import new tours
+Dialog_DropboxFolderChooser_Area_Title = Choose a Dropbox Folder
+
+Image__Dropbox_File         = dropbox-file.png
+Image__Dropbox_Folder       = dropbox-folder.png
+Image__Dropbox_Logo         = dropbox-logo.png
+Image__Dropbox_Parentfolder = dropbox-parentfolder.png
+
+Pref_CloudConnectivity_Dropbox_AccessToken_Tooltip = This is the access token to access your Dropbox account
+Pref_CloudConnectivity_Dropbox_WebPage_Link        = https://www.dropbox.com
+
diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/messages_cs.properties b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/messages_cs.properties
@@ -1,2 +1,18 @@
 #Generated by Eclipse Messages Editor (Eclipse Babel)
 Pref_CloudConnectivity_Authorize_Button    			       = &Autorizovat
+
+Dialog_DropboxBrowser_Button_ParentFolder_Tooltip = P\u0159ejde do nad\u0159azen\u00E9 slo\u017Eky
+Dialog_DropboxBrowser_Button_SelectFolder         = Zvolit &slo\u017Eku
+Dialog_DropboxBrowser_Text_AbsolutePath_Tooltip   = Absolutn\u00ED cesta k aktu\u00E1ln\u00ED slo\u017Ece
+
+Dialog_DropboxFolderChooser_Area_Text  = Zvolte slo\u017Eku Dropbox k n\u00ED\u017E bude MyTourbook p\u0159istupovat pro import nov\u00FDch tras
+Dialog_DropboxFolderChooser_Area_Title = Zvolen\u00ED slo\u017Eky Dropbox
+
+Image__Dropbox_File         = dropbox-file.png
+Image__Dropbox_Folder       = dropbox-folder.png
+Image__Dropbox_Logo         = dropbox-logo.png
+Image__Dropbox_Parentfolder = dropbox-parentfolder.png
+
+Pref_CloudConnectivity_Dropbox_AccessToken_Tooltip         = Toto je p\u0159\u00EDstupov\u00FD token pro p\u0159\u00EDstup k va\u0161emu \u00FA\u010Dtu Dropbox
+
+
diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/messages_de.properties b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/messages_de.properties
@@ -1,2 +1,18 @@
 #Generated by Eclipse Messages Editor (Eclipse Babel)
 Pref_CloudConnectivity_Authorize_Button            = &Autorisieren
+
+Dialog_DropboxBrowser_Button_ParentFolder_Tooltip = Gehen zum \u00FCbergeordneten Ordner
+Dialog_DropboxBrowser_Button_SelectFolder         = &Ordner Ausw\u00E4hlen
+Dialog_DropboxBrowser_Text_AbsolutePath_Tooltip   = Absoluter Pfad des aktuellen Ordners
+
+Dialog_DropboxFolderChooser_Area_Text  = W\u00E4hle einen Dropbox Ordner von dem MyTourbook neue Touren importieren soll
+Dialog_DropboxFolderChooser_Area_Title = Dropbox Ordner ausw\u00E4hlen
+
+Image__Dropbox_File         = dropbox-file.png
+Image__Dropbox_Folder       = dropbox-folder.png
+Image__Dropbox_Logo         = dropbox-logo.png
+Image__Dropbox_Parentfolder = dropbox-parentfolder.png
+
+Pref_CloudConnectivity_Dropbox_AccessToken_Tooltip         = Das ist der Zugangstoken f\u00FCr den Zugriff auf dein Dropbox Konto
+
+
diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/messages_es.properties b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/messages_es.properties
@@ -1 +1,7 @@
 #Generated by Eclipse Messages Editor (Eclipse Babel)
+
+Image__Dropbox_File         = dropbox-file.png
+Image__Dropbox_Folder       = dropbox-folder.png
+Image__Dropbox_Logo         = dropbox-logo.png
+Image__Dropbox_Parentfolder = dropbox-parentfolder.png
+