Check-in [84478fc183]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:84478fc1839677d2cbe591cfeec154703918445d
Date: 2012-10-11 00:06:58
User: BarryK
Comment:L18L reported categories need translating in ppm

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/usr/local/petget/downloadpkgs.sh

@@ -19,10 +19,11 @@
 #120313 'noarch' repo is on quirky ibiblio site.
 #120515 support download from arm gentoo compat-distro binary pkgs on ibiblio quirky site.
 #120904 vertical scrollbar for successful-install window. 120907 another.
 #120908 fixes for composing repo-list.
 #120927 want to translate "CATEGORY:" and "PACKAGE:" that are in /tmp/petget-installed-pkgs-log (see installpkg.sh).
+#121011 L18L reported problem, category names also need translating.
 
 export TEXTDOMAIN=petget___downloadpkgs.sh
 export OUTPUT_CHARSET=UTF-8
 
 #export LANG=C
@@ -282,17 +283,49 @@
  else
   BUTTONS9="<hbox>
     <button ok></button>
    </hbox>"
  fi
- INSTALLEDMSG="`cat /tmp/petget-installed-pkgs-log`"
+ INSTALLEDMSG="`cat /tmp/petget-installed-pkgs-log`" #ex line: "PACKAGE: langpack_ru-20120720 CATEGORY: Setup"
+ #note, same code in petget...
+ #121011 L18L reported problem, category names also need translating...
+ ZDesktop="$(gettext 'Desktop')"
+ ZSystem="$(gettext 'System')"
+ ZSetup="$(gettext 'Setup')"
+ ZUtility="$(gettext 'Utility')"
+ ZFilesystem="$(gettext 'Filesystem')"
+ ZGraphic="$(gettext 'Graphic')"
+ ZDocument="$(gettext 'Document')"
+ ZBusiness="$(gettext 'Business')"
+ ZPersonal="$(gettext 'Personal')"
+ ZNetwork="$(gettext 'Network')"
+ ZInternet="$(gettext 'Internet')"
+ ZMultimedia="$(gettext 'Multimedia')"
+ ZFun="$(gettext 'Fun')"
+ ZHelp="$(gettext 'Help')"
+ Znone="$(gettext 'none')"
+ ZPTNDesktop="s%CATEGORY: Desktop%CATEGORY: ${ZDesktop}%"
+ ZPTNSystem="s%CATEGORY: System%CATEGORY: ${ZSystem}%"
+ ZPTNSetup="s%CATEGORY: Setup%CATEGORY: ${ZSetup}%"
+ ZPTNUtility="s%CATEGORY: Utility%CATEGORY: ${ZUtility}%"
+ ZPTNFilesystem="s%CATEGORY: Filesystem%CATEGORY: ${ZFilesystem}%"
+ ZPTNGraphic="s%CATEGORY: Graphic%CATEGORY: ${ZGraphic}%"
+ ZPTNDocument="s%CATEGORY: Document%CATEGORY: ${ZDocument}%"
+ ZPTNBusiness="s%CATEGORY: Business%CATEGORY: ${ZBusiness}%"
+ ZPTNPersonal="s%CATEGORY: Personal%CATEGORY: ${ZPersonal}%"
+ ZPTNNetwork="s%CATEGORY: Network%CATEGORY: ${ZNetwork}%"
+ ZPTNInternet="s%CATEGORY: Internet%CATEGORY: ${ZInternet}%"
+ ZPTNMultimedia="s%CATEGORY: Multimedia%CATEGORY: ${ZMultimedia}%"
+ ZPTNFun="s%CATEGORY: Fun%CATEGORY: ${ZFun}%"
+ ZPTNHelp="s%CATEGORY: Help%CATEGORY: ${ZHelp}%"
+ ZPTNnone="s%CATEGORY: none%CATEGORY: ${Znone}%"
  #120927 want to translate "CATEGORY:" and "PACKAGE:" that are in /tmp/petget-installed-pkgs-log (see installpkg.sh)...
  ZCATEGORY="$(gettext 'CATEGORY:')"
  ZPACKAGE="$(gettext 'PACKAGE:')"
  ZPTN1="s%CATEGORY:%${ZCATEGORY}%"
  ZPTN2="s%PACKAGE:%${ZPACKAGE}%"
- ZINSTALLEDMSG="$(sed -e "$ZPTN1" -e "$ZPTN2" /tmp/petget-installed-pkgs-log)"
+ ZINSTALLEDMSG="$(sed -e "$ZPTNDesktop" -e "$ZPTNSystem" -e "$ZPTNSetup" -e "$ZPTNUtility" -e "$ZPTNFilesystem" -e "$ZPTNGraphic" -e "$ZPTNDocument" -e "$ZPTNBusiness" -e "$ZPTNPersonal" -e "$ZPTNNetwork" -e "$ZPTNInternet" -e "$ZPTNMultimedia" -e "$ZPTNFun" -e "$ZPTNHelp" -e "$ZPTNnone" -e "$ZPTN1" -e "$ZPTN2" /tmp/petget-installed-pkgs-log)" #121011 more ptns.
  CAT_MSG="$(gettext 'Note: the package(s) do not have a menu entry.')"
  [ "`echo "$INSTALLEDMSG" | grep -o 'CATEGORY.*' | grep -v 'none'`" != "" ] && CAT_MSG="$(gettext '...look in the appropriate category in the menu (bottom-left of screen) to run the application. Note, some packages do not have a menu entry.')" #424 fix. 101016 fix.
  #120904 vertical scrollbar...
  export INSTALL_DIALOG="<window title=\"$(gettext 'Puppy Package Manager')\" icon-name=\"gtk-about\">
   <vbox>

Changes to woof-code/rootfs-skeleton/usr/local/petget/petget

@@ -24,10 +24,11 @@
 #120323 replace 'xmessage' with 'pupmessage'.
 #120504 now have /tmp/petget folder.
 #120719 support raspbian.
 #120819 having a category does not mean there will also be a menu entry.
 #120927 want to translate "CATEGORY:" and "PACKAGE:" that are in /tmp/petget-installed-pkgs-log (see installpkg.sh).
+#121011 L18L reported problem, category names also need translating.
 
 export TEXTDOMAIN=petget___petget
 export OUTPUT_CHARSET=UTF-8
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
@@ -243,16 +244,49 @@
  gtkdialog3 --program=FAIL_DIALOG
  exit
 fi
 
 INSTALLEDMSG="`cat /tmp/petget-installed-pkgs-log`"
+#121011 L18L reported problem, category names also need translating...
+ZDesktop="$(gettext 'Desktop')"
+ZSystem="$(gettext 'System')"
+ZSetup="$(gettext 'Setup')"
+ZUtility="$(gettext 'Utility')"
+ZFilesystem="$(gettext 'Filesystem')"
+ZGraphic="$(gettext 'Graphic')"
+ZDocument="$(gettext 'Document')"
+ZBusiness="$(gettext 'Business')"
+ZPersonal="$(gettext 'Personal')"
+ZNetwork="$(gettext 'Network')"
+ZInternet="$(gettext 'Internet')"
+ZMultimedia="$(gettext 'Multimedia')"
+ZFun="$(gettext 'Fun')"
+ZHelp="$(gettext 'Help')"
+Znone="$(gettext 'none')"
+ZPTNDesktop="s%CATEGORY: Desktop%CATEGORY: ${ZDesktop}%"
+ZPTNSystem="s%CATEGORY: System%CATEGORY: ${ZSystem}%"
+ZPTNSetup="s%CATEGORY: Setup%CATEGORY: ${ZSetup}%"
+ZPTNUtility="s%CATEGORY: Utility%CATEGORY: ${ZUtility}%"
+ZPTNFilesystem="s%CATEGORY: Filesystem%CATEGORY: ${ZFilesystem}%"
+ZPTNGraphic="s%CATEGORY: Graphic%CATEGORY: ${ZGraphic}%"
+ZPTNDocument="s%CATEGORY: Document%CATEGORY: ${ZDocument}%"
+ZPTNBusiness="s%CATEGORY: Business%CATEGORY: ${ZBusiness}%"
+ZPTNPersonal="s%CATEGORY: Personal%CATEGORY: ${ZPersonal}%"
+ZPTNNetwork="s%CATEGORY: Network%CATEGORY: ${ZNetwork}%"
+ZPTNInternet="s%CATEGORY: Internet%CATEGORY: ${ZInternet}%"
+ZPTNMultimedia="s%CATEGORY: Multimedia%CATEGORY: ${ZMultimedia}%"
+ZPTNFun="s%CATEGORY: Fun%CATEGORY: ${ZFun}%"
+ZPTNHelp="s%CATEGORY: Help%CATEGORY: ${ZHelp}%"
+ZPTNnone="s%CATEGORY: none%CATEGORY: ${Znone}%"
 #120927 want to translate "CATEGORY:" and "PACKAGE:" that are in /tmp/petget-installed-pkgs-log (see installpkg.sh)...
+#note, same code in downloadpkgs.sh...
 ZCATEGORY="$(gettext 'CATEGORY:')"
 ZPACKAGE="$(gettext 'PACKAGE:')"
 ZPTN1="s%CATEGORY:%${ZCATEGORY}%"
 ZPTN2="s%PACKAGE:%${ZPACKAGE}%"
-ZINSTALLEDMSG="$(sed -e "$ZPTN1" -e "$ZPTN2" /tmp/petget-installed-pkgs-log)"
+#ZINSTALLEDMSG="$(sed -e "$ZPTN1" -e "$ZPTN2" /tmp/petget-installed-pkgs-log)"
+ZINSTALLEDMSG="$(sed -e "$ZPTNDesktop" -e "$ZPTNSystem" -e "$ZPTNSetup" -e "$ZPTNUtility" -e "$ZPTNFilesystem" -e "$ZPTNGraphic" -e "$ZPTNDocument" -e "$ZPTNBusiness" -e "$ZPTNPersonal" -e "$ZPTNNetwork" -e "$ZPTNInternet" -e "$ZPTNMultimedia" -e "$ZPTNFun" -e "$ZPTNHelp" -e "$ZPTNnone" -e "$ZPTN1" -e "$ZPTN2" /tmp/petget-installed-pkgs-log)" #121011 more ptns.
 MENUMSG=""
 INSTALLEDCAT="`echo -n "$INSTALLEDMSG" | rev | cut -f 1 -d ' ' | rev`"
 if [ "$INSTALLEDCAT" = "none" ];then
  MENUMSG="<text><label>$(gettext '...note, this package does not have a menu entry.')</label></text>"
 else