[Cosmo-dev] Re: [commits-cosmo] (travis) [5344] Bug 9953: Final copy review.

Matthew Eernisse mde at osafoundation.org
Wed Aug 8 17:14:26 PDT 2007 

Looks like this just got broken in the last commit or so. I'm now seeing 
this:

Welcome, test | Settings | Account Browser | Log out    Help

Two problems:

1. Missing pipe separator between the last two items.
2. Dueling case conventions in the menu items.

I'd expect to see this:

Welcome, test | Settings | Account Browser | Log Out | Help

Or this:

Welcome, test | Settings | Account browser | Log out | Help

Doesn't matter which case convention we follow; let's just pick one.

I know it's a lot of hairy conditionals drawing that thing -- wouldn't 
it be cool to find some way to rig a fairly quick check of every 
permutation of the menu rendering to ensure it'll look right in every 
configuration?


M.


svncheckin at osafoundation.org wrote:
> Revision
>     5344 <http://cvs.osafoundation.org/viewcvs.cgi?rev=5344&view=rev>
> Author
>     travis
> Date
>     2007-08-08 14:52:03 -0700 (Wed, 08 Aug 2007)
> 
> 
>       Log Message
> 
> Bug 9953 <http://bugzilla.osafoundation.org/show_bug.cgi?id=9953>: Final 
> copy review. Move some labels out of detail.js.
> 
> FTW!
> 
> 
>       Modified Paths
> 
>     * cosmo/trunk/cosmo/src/main/resources/PimMessageResources.properties
>       <#cosmotrunkcosmosrcmainresourcesPimMessageResourcesproperties>
>     * cosmo/trunk/cosmo/src/main/webapp/js/cosmo/ui/detail.js
>       <#cosmotrunkcosmosrcmainwebappjscosmouidetailjs>
> 
> 
>       Diff
> 
> 
>         Modified:
>         cosmo/trunk/cosmo/src/main/resources/PimMessageResources.properties
>         (5343 => 5344)
> 
> --- cosmo/trunk/cosmo/src/main/resources/PimMessageResources.properties	2007-08-08 21:25:01 UTC (rev 5343)
> +++ cosmo/trunk/cosmo/src/main/resources/PimMessageResources.properties	2007-08-08 21:52:03 UTC (rev 5344)
> @@ -94,8 +94,8 @@
>  App.Error.FebruaryDays=Too many days for February of that year.
>  App.Error.InvalidTimeFormat=Time must be in the following format: hh:mm (ex. 4:35).
>  App.Error.InvalidHourRange=Hour must be between 1 and 12.
> -App.Error.InvalidMinutesRange=Minutes must between 00 and 59.
> -App.Error.NoEndTimeWithoutStartTime=You can't have an end time without a start time
> +App.Error.InvalidMinutesRange=Minutes must be between 00 and 59.
> +App.Error.NoEndTimeWithoutStartTime=You cannot have an end time without a start time
>  
>  # Identity
>  # ======================
> @@ -111,7 +111,7 @@
>  Login.Prompt.Init=Enter your username and password, and click Log in.
>  Login.Prompt.Processing=Verifying username and password. Please wait...
>  Login.Error.RequiredFields=Both Username and Password are required fields.
> -Login.Error.AuthFailed=Could not verify your username and password. Please try again.<br/><br/>If you have just signed up for an account, you may need to check your email to activate the account.
> +Login.Error.AuthFailed=Could not verify your username and password. Please try again.<br/><br/>If you have just signed up for an account, check your email to activate your account before logging in.
>  Login.CreateAccount=Don&#8217;t have an account?
>  Login.ClickHere=Sign up.
>  Login.Forgot=Forgot your username or password?
> @@ -235,9 +235,10 @@
>  Main.DetailForm.ReadOnly=You cannot make changes to items in this collection.
>  Main.DetailForm.Error=Error in item details
>  Main.DetailForm.EMail=Send an email notification
> -Main.DetailForm.From=From
> -Main.DetailForm.To=To
> -Main.DetailForm.Cc=Cc
> +Main.DetailForm.From=From&nbsp;
> +Main.DetailForm.To=To&nbsp;
> +Main.DetailForm.Cc=Cc&nbsp;
> +Main.DetailForm.Bcc=Bcc&nbsp;
>  Main.DetailForm.displayName=Title
>  Main.DetailForm.Location=Location
>  Main.DetailForm.startDate=Starts
> @@ -247,7 +248,7 @@
>  Main.DetailForm.Region=Region...
>  Main.DetailForm.TimezoneSelector.Timezone=Time zone...
>  Main.DetailForm.TimezoneSelector.None=None
> -Main.DetailForm.Status=Status:
> +Main.DetailForm.Status=Status
>  Main.DetailForm.rrule=Occurs
>  Main.DetailForm.Ending=ends
>  Main.DetailForm.Description=Notes
> @@ -273,8 +274,8 @@
>  Main.Error.ItemEditSaveFailed=Could not save changes to item.
>  Main.Error.ItemRemoveFailed=Could not remove item.
>  Main.Error.ItemTimezoneMismatch=Item's Start and End-times have different time zones.
> -Main.Error.GoToDate=Go to' date error.
> -Main.Error.Concurrency=Someone else is editing this item.
> +Main.Error.GoToDate=Go to date error.
> +Main.Error.Concurrency=Someone else is editing this item right now.
>  Main.Error.ItemDoesNotExist=Item has been deleted from the server.
>  Main.Error.SubscribedCollectionDeleted='{0}' has been deleted from the server.
>  Main.Error.EventEditSaveFailed.EventRemoved=Could not save edits. Event has been deleted from the server.
> @@ -315,11 +316,11 @@
>  
>  Main.CollectionDetails.Instructions.Chandler.1=1. Copy URL to the clipboard.
>  Main.CollectionDetails.Instructions.Chandler.2=2. Start up Chandler. Go to the 'Share' menu and select 'Subscribe...'.
> -Main.CollectionDetails.Instructions.Chandler.3=3. Paste the URL into the 'URL:' field.
> +Main.CollectionDetails.Instructions.Chandler.3=3. Paste the URL into the 'URL' field.
>  Main.CollectionDetails.Instructions.Chandler.4=4. Click 'Subscribe'.
>  Main.CollectionDetails.Instructions.iCal.1=1. Copy the URL below to the clipboard.
>  Main.CollectionDetails.Instructions.iCal.2=2. Start up iCal. Go to the 'Calendar' menu and select 'Subscribe...'.
> -Main.CollectionDetails.Instructions.iCal.3=3. Paste the URL into the 'URL:' field.
> +Main.CollectionDetails.Instructions.iCal.3=3. Paste the URL into the 'URL' field.
>  Main.CollectionDetails.Instructions.iCal.4=4. Click 'Subscribe'. (Note: iCal will ask you for your username and password when subscribing to this collection.)
>  Main.CollectionDetails.Instructions.icalNotSupported.1=Unfortunately Chandler Server only supports Https connections, which Apple iCal cannot currently access.
>  Main.CollectionDetails.Instructions.FeedReader.1=Subscribe with the URL below.
> 
> 
>         Modified:
>         cosmo/trunk/cosmo/src/main/webapp/js/cosmo/ui/detail.js (5343 =>
>         5344)
> 
> --- cosmo/trunk/cosmo/src/main/webapp/js/cosmo/ui/detail.js	2007-08-08 21:25:01 UTC (rev 5343)
> +++ cosmo/trunk/cosmo/src/main/webapp/js/cosmo/ui/detail.js	2007-08-08 21:52:03 UTC (rev 5344)
> @@ -975,7 +975,7 @@
>              td = _createElem('td');
>              td.style.width = '36px';
>              td.style.textAlign = 'right';
> -            td.innerHTML = label + ':&nbsp;';
> +            td.innerHTML = label;
>              td.className = 'labelTextHoriz';
>              tr.appendChild(td);
>              td = _createElem('td');
> @@ -1000,10 +1000,10 @@
>          table.cellSpacing = '0';
>          table.appendChild(tbody);
>  
> -        tbody.appendChild(mailRow('Fr', 'From'));
> -        tbody.appendChild(mailRow('To', 'To'));
> -        tbody.appendChild(mailRow('Cc', 'Cc'));
> -        tbody.appendChild(mailRow('Bcc', 'Bcc'));
> +        tbody.appendChild(mailRow(_('Main.DetailForm.From'), 'From'));
> +        tbody.appendChild(mailRow(_('Main.DetailForm.To'), 'To'));
> +        tbody.appendChild(mailRow(_('Main.DetailForm.Cc'), 'Cc'));
> +        tbody.appendChild(mailRow(_('Main.DetailForm.Bcc'), 'Bcc'));
>  
>          f.appendChild(table);
>          d.appendChild(f);
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> Commits-Cosmo mailing list
> Commits-Cosmo at osafoundation.org
> http://lists.osafoundation.org/cgi-bin/mailman/listinfo/commits-cosmo

More information about the cosmo-dev mailing list