From edb7106763f973d39c24c94b46384f568c97e1c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Sundstr=C3=B6m?= Date: Thu, 31 Mar 2011 07:31:56 +0000 Subject: [PATCH] Localization of the most user-visible folders. Ignoring subfolders of common/, system/ and home/config/. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41148 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 3 +- .../add_catalog_entry_attributes.sh | 105 ++++++++++++++++++ src/apps/deskbar/Jamfile | 1 + src/apps/deskbar/LocalizedFolders.h | 15 +++ src/apps/mail/Jamfile | 1 + src/apps/mail/LocalizedFolders.h | 11 ++ src/kits/tracker/Jamfile | 1 + src/kits/tracker/LocalizedFolders.h | 19 ++++ 8 files changed, 155 insertions(+), 1 deletion(-) create mode 100755 data/common/boot/post_install/add_catalog_entry_attributes.sh create mode 100644 src/apps/deskbar/LocalizedFolders.h create mode 100644 src/apps/mail/LocalizedFolders.h create mode 100644 src/kits/tracker/LocalizedFolders.h diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index a7057f1de1..0de0638c9a 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -487,7 +487,8 @@ SEARCH on $(networkSettingsFiles) AddFilesToHaikuImage common settings network : $(networkSettingsFiles) ; # post install scripts and fresh install indicator file -local postInstallFiles = mime_update.sh default_deskbar_items.sh ; +local postInstallFiles = add_catalog_entry_attributes.sh + default_deskbar_items.sh mime_update.sh ; postInstallFiles = $(postInstallFiles:G=post-install) ; SEARCH on $(postInstallFiles) = [ FDirName $(HAIKU_TOP) data common boot post_install ] ; diff --git a/data/common/boot/post_install/add_catalog_entry_attributes.sh b/data/common/boot/post_install/add_catalog_entry_attributes.sh new file mode 100755 index 0000000000..6de0546db7 --- /dev/null +++ b/data/common/boot/post_install/add_catalog_entry_attributes.sh @@ -0,0 +1,105 @@ +#!/bin/sh + +WriteCatalogEntryAttribute() +{ + # $1 : signature + # $2 : path + # $3 : context + + if ! [ -e "$2" ] + then + mkdir "$2" + fi + + addattr -t string SYS:NAME "$1:$3:$(basename "$2")" "$2" +} + + +WriteTrackerCatalogEntryAttribute() +{ + WriteCatalogEntryAttribute "x-vnd.Haiku-libtracker" "$1" "$2" +} + + +WriteDeskbarCatalogEntryAttribute() +{ + WriteCatalogEntryAttribute "x-vnd.Be-TSKB" "$1" "$2" +} + + +WriteMailCatalogEntryAttribute() +{ + WriteCatalogEntryAttribute "x-vnd.Be-MAIL" "$1" "$2" +} + + +WriteTrackerCatalogEntryAttribute \ + "$(finddir B_APPS_DIRECTORY)" B_APPS_DIRECTORY + +WriteTrackerCatalogEntryAttribute \ + "$(finddir B_COMMON_DIRECTORY)" B_COMMON_DIRECTORY + +WriteTrackerCatalogEntryAttribute \ + "$(finddir B_COMMON_DEVELOP_DIRECTORY)" B_COMMON_DEVELOP_DIRECTORY + +WriteTrackerCatalogEntryAttribute \ + "$(finddir B_USER_DIRECTORY)" B_USER_DIRECTORY + +WriteTrackerCatalogEntryAttribute \ + "$(finddir B_DESKTOP_DIRECTORY)" B_DESKTOP_DIRECTORY + +WriteTrackerCatalogEntryAttribute \ + "$(finddir B_USER_CONFIG_DIRECTORY)" B_USER_CONFIG_DIRECTORY + +WriteTrackerCatalogEntryAttribute \ + "$(finddir B_USER_SETTINGS_DIRECTORY)/Tracker/Tracker New Templates" \ + "B_USER_SETTINGS_DIRECTORY/Tracker/Tracker New Templates" + +WriteTrackerCatalogEntryAttribute "/boot/optional" "/boot/optional" + +WriteTrackerCatalogEntryAttribute \ + "$(finddir B_PREFERENCES_DIRECTORY)" B_PREFERENCES_DIRECTORY + +WriteTrackerCatalogEntryAttribute \ + "$(finddir B_SYSTEM_DIRECTORY)" B_SYSTEM_DIRECTORY + +WriteTrackerCatalogEntryAttribute \ + "$(finddir B_TRASH_DIRECTORY)" B_TRASH_DIRECTORY + + + +WriteDeskbarCatalogEntryAttribute \ + "$(finddir B_USER_DESKBAR_DIRECTORY)/Applications" "B_USER_DESKBAR_DIRECTORY/Applications" + +WriteDeskbarCatalogEntryAttribute \ + "$(finddir B_USER_DESKBAR_DIRECTORY)/Demos" "B_USER_DESKBAR_DIRECTORY/Demos" + +WriteDeskbarCatalogEntryAttribute \ + "$(finddir B_USER_DESKBAR_DIRECTORY)/Desktop applets" "B_USER_DESKBAR_DIRECTORY/Desktop applets" + +WriteDeskbarCatalogEntryAttribute \ + "$(finddir B_USER_DESKBAR_DIRECTORY)/Preferences" "B_USER_DESKBAR_DIRECTORY/Preferences" + + + +WriteMailCatalogEntryAttribute \ + "$(finddir B_USER_DIRECTORY)/mail" "B_USER_DIRECTORY/mail" + +WriteMailCatalogEntryAttribute \ + "$(finddir B_USER_DIRECTORY)/mail/draft" "B_USER_DIRECTORY/mail/draft" + +WriteMailCatalogEntryAttribute \ + "$(finddir B_USER_DIRECTORY)/mail/in" "B_USER_DIRECTORY/mail/in" + +WriteMailCatalogEntryAttribute \ + "$(finddir B_USER_DIRECTORY)/mail/out" "B_USER_DIRECTORY/mail/out" + +WriteMailCatalogEntryAttribute \ + "$(finddir B_USER_DIRECTORY)/mail/queries" "B_USER_DIRECTORY/mail/queries" + +WriteMailCatalogEntryAttribute \ + "$(finddir B_USER_DIRECTORY)/mail/sent" "B_USER_DIRECTORY/mail/sent" + +WriteMailCatalogEntryAttribute \ + "$(finddir B_USER_DIRECTORY)/mail/spam" "B_USER_DIRECTORY/mail/spam" + diff --git a/src/apps/deskbar/Jamfile b/src/apps/deskbar/Jamfile index 72fabbb561..7788b40026 100644 --- a/src/apps/deskbar/Jamfile +++ b/src/apps/deskbar/Jamfile @@ -47,6 +47,7 @@ DoCatalogs Deskbar : : BarWindow.cpp BeMenu.cpp + LocalizedFolders.h PreferencesWindow.cpp StatusView.cpp TimeView.cpp diff --git a/src/apps/deskbar/LocalizedFolders.h b/src/apps/deskbar/LocalizedFolders.h new file mode 100644 index 0000000000..e2134cf2cc --- /dev/null +++ b/src/apps/deskbar/LocalizedFolders.h @@ -0,0 +1,15 @@ +#include + + +B_TRANSLATE_MARK_ALL("Applications", + "B_USER_DESKBAR_DIRECTORY/Applications", ""); + +B_TRANSLATE_MARK_ALL("Demos", + "B_USER_DESKBAR_DIRECTORY/Demos", ""); + +B_TRANSLATE_MARK_ALL("Desktop applets", + "B_USER_DESKBAR_DIRECTORY/Desktop applets", ""); + +B_TRANSLATE_MARK_ALL("Preferences", + "B_USER_DESKBAR_DIRECTORY/Preferences", ""); + diff --git a/src/apps/mail/Jamfile b/src/apps/mail/Jamfile index 38196c3f6d..87c736a440 100644 --- a/src/apps/mail/Jamfile +++ b/src/apps/mail/Jamfile @@ -45,6 +45,7 @@ DoCatalogs Mail : Enclosures.cpp FindWindow.cpp Header.cpp + LocalizedFolders.h MailApp.cpp MailPopUpMenu.cpp MailWindow.cpp diff --git a/src/apps/mail/LocalizedFolders.h b/src/apps/mail/LocalizedFolders.h new file mode 100644 index 0000000000..20621ac44a --- /dev/null +++ b/src/apps/mail/LocalizedFolders.h @@ -0,0 +1,11 @@ +#include + + +B_TRANSLATE_MARK_ALL("mail", "B_USER_DIRECTORY/mail", ""); +B_TRANSLATE_MARK_ALL("draft", "B_USER_DIRECTORY/mail/draft", ""); +B_TRANSLATE_MARK_ALL("in", "B_USER_DIRECTORY/mail/in", ""); +B_TRANSLATE_MARK_ALL("out", "B_USER_DIRECTORY/mail/out", ""); +B_TRANSLATE_MARK_ALL("queries", "B_USER_DIRECTORY/mail/queries", ""); +B_TRANSLATE_MARK_ALL("sent", "B_USER_DIRECTORY/mail/sent", ""); +B_TRANSLATE_MARK_ALL("spam", "B_USER_DIRECTORY/mail/spam", ""); + diff --git a/src/kits/tracker/Jamfile b/src/kits/tracker/Jamfile index 0f4edfd3f8..248e9c3ee2 100644 --- a/src/kits/tracker/Jamfile +++ b/src/kits/tracker/Jamfile @@ -108,6 +108,7 @@ DoCatalogs libtracker.so : FSClipboard.cpp FSUtils.cpp InfoWindow.cpp + LocalizedFolders.h Model.cpp MountMenu.cpp NavMenu.cpp diff --git a/src/kits/tracker/LocalizedFolders.h b/src/kits/tracker/LocalizedFolders.h new file mode 100644 index 0000000000..12979219a3 --- /dev/null +++ b/src/kits/tracker/LocalizedFolders.h @@ -0,0 +1,19 @@ +#include + + +B_TRANSLATE_MARK_ALL("apps", "B_APPS_DIRECTORY", ""); +B_TRANSLATE_MARK_ALL("common", "B_COMMON_DIRECTORY", ""); +B_TRANSLATE_MARK_ALL("develop", "B_COMMON_DEVELOP_DIRECTORY", ""); +B_TRANSLATE_MARK_ALL("optional", "/boot/optional", ""); +B_TRANSLATE_MARK_ALL("preferences", "B_PREFERENCES_DIRECTORY", ""); +B_TRANSLATE_MARK_ALL("system", "B_SYSTEM_DIRECTORY", ""); + +B_TRANSLATE_MARK_ALL("home", "B_USER_DIRECTORY", ""); +B_TRANSLATE_MARK_ALL("config", "B_USER_CONFIG_DIRECTORY", ""); +B_TRANSLATE_MARK_ALL("Tracker New Templates", + "B_USER_SETTINGS_DIRECTORY/Tracker/Tracker New Templates", ""); + +// these are currently special-cased in Tracker +B_TRANSLATE_MARK_ALL("trash", "B_TRASH_DIRECTORY", ""); +B_TRANSLATE_MARK_ALL("Desktop", "B_DESKTOP_DIRECTORY", ""); +