Removed some G_CRITICALS

[modest] / src / modest-text-utils.h

diff --git a/src/modest-text-utils.h b/src/modest-text-utils.h
index be09b9c..e387c16 100644 (file)
--- a/src/modest-text-utils.h
+++ b/src/modest-text-utils.h
@@ -46,6 +46,51 @@
 #define _KR(str) dgettext("ke-recv",str)
 #define _UR(str) dgettext("osso-uri",str)
 
+#ifdef MODEST_TOOLKIT_HILDON2
+#define _HL_SAVE _HL("wdgt_bd_save")
+#define _HL_YES _HL("wdgt_bd_yes")
+#define _HL_NO _HL("wdgt_bd_no")
+#define _HL_VIEW _HL("wdgt_bd_view")
+#define _HL_TITLE_SORT _HL("ckdg_ti_sort")
+#define _HL_TITLE_NEW_FOLDER _HL("ckdg_ti_new_folder")
+#define _HL_TITLE_RENAME_FOLDER _HL("ckdg_ti_rename_folder")
+#define _HL_DATE _HL("wdgt_va_date")
+#define _HL_24H_TIME _HL("wdgt_va_24h_time")
+#define _HL_WEEK _HL("wdgt_va_week")
+#define _HL_DATE_MEDIUM _HL("wdgt_va_date_medium")
+#define _HL_12H_TIME_PM _HL("wdgt_va_12h_time_pm")
+#define _HL_12H_TIME_AM _HL("wdgt_va_12h_time_am")
+#define _HL_DONE _HL("wdgt_bd_done")
+#define _HL_DELETE _HL("wdgt_bd_delete")
+#define _HL_MOVE _HL("wdgt_bd_move")
+#define _HL_RENAME _HL("wdgt_bd_rename")
+#define _HL_IB_FIND_COMPLETE _HL("ckct_ib_find_search_complete")
+#define _HL_IB_FIND_NO_MATCHES _HL("ckct_ib_find_no_matches")
+#define _HL_IB_ZOOM _HL("wdgt_ib_zoom")
+#else
+#define _HL_SAVE _("Save")
+#define _HL_YES _("Yes")
+#define _HL_NO _("Yes")
+#define _HL_VIEW _("View")
+#define _HL_TITLE_SORT _("Sort")
+#define _HL_TITLE_NEW_FOLDER _("New folder")
+#define _HL_TITLE_RENAME_FOLDER _HL("Rename folder")
+#define _HL_RENAME_NAME _("Name")
+#define _HL_24H_TIME _("%H:%M")
+#define _HL_DATE _("%m/%d/%Y")
+#define _HL_WEEK _("%A")
+#define _HL_DATE_MEDIUM _("%e %B %Y")
+#define _HL_12H_TIME_PM _("%l:%M pm")
+#define _HL_12H_TIME_AM _("%l:%M am")
+#define _HL_DONE _("Done")
+#define _HL_DELETE _("Delete")
+#define _HL_MOVE _("Move")
+#define _HL_RENAME _("Rename")
+#define _HL_IB_FIND_COMPLETE _("Search complete")
+#define _HL_IB_FIND_NO_MATCHES _("No matches")
+#define _HL_IB_ZOOM _("Zoom %d")
+#endif
+
 /* Forbidden char arrays */
 extern const gchar account_title_forbidden_chars[];
 extern const gchar folder_name_forbidden_chars[];
@@ -61,16 +106,22 @@ extern const guint USER_NAME_FORBIDDEN_CHARS_LENGTH;
 /**
  * modest_text_utils_derived_subject:
  * @subject: a string which contains the original subject
- * @prefix: the prefix for the new subject (such as 'Re:' or 'Fwd:'),
- *           must not be NULL
+ * @is_reply: whether the derived subject is for a reply or a forward message
+ *
+ * create a 'derived' subject line for eg. replies and forwards. Note
+ * that this function will use the localized versions of "Re" and
+ * "Fw", unless one of these two versions was already included. For
+ * example replying to an email in Finish would work as:
+ *
+ * "some subject"     -> "VS: some subject"
+ * "VS: some subject" -> "VS: some subject"
+ * "Re: some subject" -> "Re: some subject"
+ * "Fw: some subject" -> "VS: Fw: some subject"
  *
- * create a 'derived' subject line for eg. replies and forwards 
- * 
  * Returns: a newly allocated string containing the resulting subject
- * subject == NULL, then @prefix " " will be returned
  */
-gchar* modest_text_utils_derived_subject (const gchar *subject, 
-                                         const gchar* prefix);
+gchar* modest_text_utils_derived_subject (const gchar *subject,
+                                         gboolean is_reply);
 
 
 /**