Revision: 12374
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12374&view=rev
Author: amaxwell
Date: 2008-01-08 12:45:22 -0800 (Tue, 08 Jan 2008)
Log Message:
-----------
Fix genstrings complaints about invalid string literals and display warnings
from genstrings.
Modified Paths:
--------------
trunk/bibdesk/BDSKMainTableView.m
trunk/bibdesk/BDSKZoomablePDFView.m
trunk/bibdesk/BDSKZoomableScrollView.m
trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj
trunk/bibdesk/main.m
Modified: trunk/bibdesk/BDSKMainTableView.m
===================================================================
--- trunk/bibdesk/BDSKMainTableView.m 2008-01-08 19:12:13 UTC (rev 12373)
+++ trunk/bibdesk/BDSKMainTableView.m 2008-01-08 20:45:22 UTC (rev 12374)
@@ -365,7 +365,8 @@
}else if(title = [self headerTitleForField:colName]){
[[tc headerCell] setStringValue:title];
}else{
- [[tc headerCell]
setStringValue:NSLocalizedStringFromTable(colName, @"BibTeXKeys", @"")];
+ NSString *localizedKey = [[NSBundle mainBundle]
localizedStringForKey:colName value:@"" table:@"BibTeXKeys"];
+ [[tc headerCell] setStringValue:localizedKey];
}
if([colName isEqualToString:BDSKImportOrderString] == NO && (tcWidth =
[defaultTableColumnWidths objectForKey:colName]))
Modified: trunk/bibdesk/BDSKZoomablePDFView.m
===================================================================
--- trunk/bibdesk/BDSKZoomablePDFView.m 2008-01-08 19:12:13 UTC (rev 12373)
+++ trunk/bibdesk/BDSKZoomablePDFView.m 2008-01-08 20:45:22 UTC (rev 12374)
@@ -207,7 +207,7 @@
// fill it
for (cnt = 0; cnt < numberOfDefaultItems; cnt++) {
- label =
NSLocalizedStringFromTable(BDSKDefaultScaleMenuLabels[cnt], @"ZoomValues", nil);
+ label = [[NSBundle mainBundle]
localizedStringForKey:BDSKDefaultScaleMenuLabels[cnt] value:@""
table:@"ZoomValues"];
width = NSWidth([label boundingRectWithSize:size options:0
attributes:attrs]);
if (width > maxWidth) {
maxWidth = width;
Modified: trunk/bibdesk/BDSKZoomableScrollView.m
===================================================================
--- trunk/bibdesk/BDSKZoomableScrollView.m 2008-01-08 19:12:13 UTC (rev
12373)
+++ trunk/bibdesk/BDSKZoomableScrollView.m 2008-01-08 20:45:22 UTC (rev
12374)
@@ -73,7 +73,7 @@
// fill it
for (cnt = 0; cnt < numberOfDefaultItems; cnt++) {
- label =
NSLocalizedStringFromTable(BDSKDefaultScaleMenuLabels[cnt], @"ZoomValues", nil);
+ label = [[NSBundle mainBundle]
localizedStringForKey:BDSKDefaultScaleMenuLabels[cnt] value:@""
table:@"ZoomValues"];
width = NSWidth([label boundingRectWithSize:size options:0
attributes:attrs]);
if (width > maxWidth) {
maxWidth = width;
Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj
===================================================================
--- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-01-08 19:12:13 UTC
(rev 12373)
+++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-01-08 20:45:22 UTC
(rev 12374)
@@ -3439,7 +3439,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ -d
\"${SYSTEM_DEVELOPER_UTILITIES_DIR}/Help Indexer.app\" ]; then\nif [
${BUILD_STYLE} = \"Debug\" ]; then\nexit 0\nfi\necho \"*** Indexing Tiger Help
***\"\nfor LOC_DIR in
\"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"/*.lproj; do
\\\n\"${SYSTEM_DEVELOPER_UTILITIES_DIR}/Help Indexer.app/Contents/MacOS/Help
Indexer\" \\\n\"${LOC_DIR}/BibDesk Help\" \\\n-Tokenizer 1 \\\n-ShowProgress NO
\\\n-LogStyle 2 \\\n-IndexAnchors YES \\\n-TigerIndexing YES
\\\n-GenerateSummaries YES \\\n-Stopwords en \\\n-MinTermLength
3;\\\ndone\nfi\nexit 0";
+ shellScript = "if [ -d
\"${SYSTEM_DEVELOPER_UTILITIES_DIR}/Help Indexer.app\" ]; then\nif [
${BUILD_STYLE} = \"Debug\" ]; then\nexit 0\nfi\necho \"*** Indexing Tiger Help
***\"\nfor LOC_DIR in
\"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"/*.lproj; do
\\\n\"${SYSTEM_DEVELOPER_UTILITIES_DIR}/Help Indexer.app/Contents/MacOS/Help
Indexer\" \\\n\"${LOC_DIR}/BibDesk Help\" \\\n-Tokenizer 1 \\\n-ShowProgress NO
\\\n-LogStyle 2 \\\n-IndexAnchors YES \\\n-TigerIndexing YES
\\\n-GenerateSummaries YES \\\n-Stopwords en \\\n-MinTermLength 3
>&2;\\\ndone\nfi\nexit 0";
};
F95C5E850D10E52400C81970 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -3491,7 +3491,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "##\n## This takes a while to generate,
so it's not worth\n## the wait for development builds.\n##\nif [ ${BUILD_STYLE}
= \"Debug\" ]; then\n# Check to see if a previous version exists and create
it\n# if not, or else pbxcp will complain.\nif [ -f
\"English.lproj/Localizable.strings\" ]; then\nexit 0\nfi\nfi\n#\n# Run the
genstrings build phase\n#\ncd ${SOURCE_ROOT} && \\\nif [ -f
\"English.lproj/Localizable.strings\" ]; then\nmv
English.lproj/Localizable.strings English.lproj/Localizable.strings.bak
\nfi\n\n# skip OmniBase/macros.h because of genstrings crash\n# skip vendorsrc
entirely? need to process .h files?\n\n/usr/bin/genstrings -o
\"${SOURCE_ROOT}/English.lproj\" \\\n-skipTable BibTeXKeys -skipTable
ZoomValues -skipTable TemplateOptions \\\n*.m\n";
+ shellScript = "##\n## This takes a while to generate,
so it's not worth\n## the wait for development builds.\n##\nif [ ${BUILD_STYLE}
= \"Debug\" ]; then\n# Check to see if a previous version exists and create
it\n# if not, or else pbxcp will complain.\nif [ -f
\"English.lproj/Localizable.strings\" ]; then\nexit 0\nfi\nfi\n#\n# Run the
genstrings build phase\n#\ncd ${SOURCE_ROOT} && \\\nif [ -f
\"English.lproj/Localizable.strings\" ]; then\nmv
English.lproj/Localizable.strings English.lproj/Localizable.strings.bak
\nfi\n\n# skip OmniBase/macros.h because of genstrings crash\n# skip vendorsrc
entirely? need to process .h files?\n\n/usr/bin/genstrings -o
\"${SOURCE_ROOT}/English.lproj\" \\\n-skipTable BibTeXKeys -skipTable
ZoomValues -skipTable TemplateOptions \\\n*.m 2>&1 | sed -e
's/^.*Warning:/warning:/g' >&2\n";
};
F9FF213B09E83BAB00BB1706 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
Modified: trunk/bibdesk/main.m
===================================================================
--- trunk/bibdesk/main.m 2008-01-08 19:12:13 UTC (rev 12373)
+++ trunk/bibdesk/main.m 2008-01-08 20:45:22 UTC (rev 12374)
@@ -27,7 +27,7 @@
if (noErr != err || version < 0x00001040) {
DialogRef alert;
- // pool required for NSLocalizedString
+ // pool required for localized string
NSAutoreleasePool *pool = [NSAutoreleasePool new];
AlertStdCFStringAlertParamRec alertParamRec = {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
