Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing persian resources. #2020

Merged
merged 2 commits into from Feb 7, 2017
Merged

Fixing persian resources. #2020

merged 2 commits into from Feb 7, 2017

Conversation

Behnam-Emamian
Copy link
Contributor

Hi Microsoft Developers

I am a Persian .Net developer. I have started to use Microsoft Bot Framework for developing a Telegram Bot.

It seems Persian resource has been translated by machine not human so I try to fix them. There are some mistakes and funny translations.

@azurecla
Copy link

Hi @BehnamEmamian, I'm your friendly neighborhood Azure Pull Request Bot (You can call me AZPRBOT). Thanks for your contribution!

In order for us to evaluate and accept your PR, we ask that you sign a contribution license agreement. It's all electronic and will take just minutes. I promise there's no faxing. https://cla.azure.com.

TTYL, AZPRBOT;

@willportnoy willportnoy added the C# label Jan 19, 2017
@msft-shahins
Copy link
Contributor

Thanks for your pull request. We use Multilingual app toolkit to generate localized resource s for bot builder. As a result all of the resource are generated from .xlf files. For example, you can find the Persian xlf here: https://github.com/Microsoft/BotBuilder/blob/master/CSharp/Library/Microsoft.Bot.Builder/MultilingualResources/Microsoft.Bot.Builder.fa.xlf. It would be good if you can move your change to Microsoft.Bot.Builder.fa.xlf file, generate the resource file based on that (once you install multilingual app toolkit, building the bot builder project causes generation of updated resource files) and update your pull request.

@msft-shahins
Copy link
Contributor

@BehnamEmamian have you had a chance to make changes based on my previous comment? I can take your changes and move them to the right xlf file if you want.

@Behnam-Emamian
Copy link
Contributor Author

I was busy this week, I think I can fix it this holiday.

@Behnam-Emamian
Copy link
Contributor Author

I like this tool, it is nice.

please have a look, it should be ok.

@msft-shahins msft-shahins merged commit 387e7e5 into microsoft:master Feb 7, 2017
msft-shahins added a commit that referenced this pull request Mar 21, 2017
@msft-shahins
Squashed commit of the following:
0123c41 
commit dcad83404f82972e5f6cf9a575882c602294a345
Merge: 2448cc9 5a66adf
Author: Shahin Shayandeh <shahins@microsoft.com>
Date:   Tue Mar 21 11:20:45 2017 -0700

    Merge branch 'sharedtolibrary' of https://github.com/iedeny/BotBuilder into iedeny-sharedtolibrary1

commit 2448cc9
Author: Steve Ickman <stevenic@microsoft.com>
Date:   Mon Mar 13 18:07:10 2017 -0700

    new RecognizerFiler class

commit d74fe9c
Author: Steve Ickman <stevenic@microsoft.com>
Date:   Mon Mar 13 16:41:17 2017 -0700

    new LocalizedRegExpRecognizer class.

commit 2a78d18
Author: Steve Ickman <stevenic@microsoft.com>
Date:   Mon Mar 13 15:52:43 2017 -0700

    Fixed bug in UniversalBot.send()
    - Didn't protect against empty list of messages,
    - Also wasn't returning errors in an edge case.

commit b74bcb9
Merge: bd76705 9ee2f8d
Author: Robert Standefer <robstand@outlook.com>
Date:   Mon Mar 20 08:47:38 2017 -0700

    Merge pull request #2465 from brandonh-msft/patch-1

    Update GettingStarted.cs

commit 9ee2f8d
Author: Brandon H <hurlburb@microsoft.com>
Date:   Mon Mar 20 08:32:13 2017 -0700

    use new shorturls for dialog & controller templates

commit 826e9dc
Author: Brandon H <brandonh-msft@users.noreply.github.com>
Date:   Sun Mar 19 13:45:41 2017 -0700

    Update GettingStarted.cs

    Adding links to Dialog and Controller Item templates

commit 5a66adf
Author: Yegor Denisov <yegor.denisov@gmail.com>
Date:   Wed Mar 15 15:28:41 2017 -0700

    Remove app id and password from sample configs

commit f95ba06
Author: Yegor Denisov <yegor.denisov@gmail.com>
Date:   Wed Mar 15 15:27:55 2017 -0700

    Regenerate Microsoft.Bot.Connector.xml after merge from master

commit 1f5540d
Merge: a06cee8 bd76705
Author: Andre Esteve <andreesteve@gmail.com>
Date:   Wed Mar 15 23:09:21 2017 +0100

    Merge remote-tracking branch 'origin/master' into sharedtolibrary

commit bd76705
Author: Steve Ickman <stevenic@microsoft.com>
Date:   Mon Mar 13 14:58:01 2017 -0700

    Bug fixes around new debug event.

commit d2f0299
Author: Steve Ickman <stevenic@microsoft.com>
Date:   Thu Mar 9 13:33:31 2017 -0800

    Added customAction() feature.

commit 2d26947
Author: Steve Ickman <stevenic@microsoft.com>
Date:   Wed Mar 8 15:34:59 2017 -0800

    Updated docs with session logger stuff.

commit b77f683
Author: Steve Ickman <stevenic@microsoft.com>
Date:   Tue Mar 7 22:14:35 2017 -0800

    Added watch support.

commit 125f22b
Author: Steve Ickman <stevenic@microsoft.com>
Date:   Tue Mar 7 19:30:58 2017 -0800

    DEBUG event support
    - Stream console logs to emulator

commit b3b602e
Author: Shahin Shayandeh <shahins@microsoft.com>
Date:   Tue Mar 7 15:14:33 2017 -0800

    Update assembly versions for latest release

commit 07f3e89
Author: Shahin Shayandeh <shahins@microsoft.com>
Date:   Tue Mar 7 13:53:27 2017 -0800

    Update the french resource file and test

commit 2956e49
Merge: a7e4677 3564235
Author: Shahin Shayandeh <shahins@microsoft.com>
Date:   Tue Mar 7 13:46:06 2017 -0800

    Merge branch 'develop'

commit a06cee8
Author: Yegor Denisov <yegor.denisov@gmail.com>
Date:   Tue Mar 7 12:27:01 2017 -0800

    Microsoft.Bot.Builder.VS2017.sln auto-refreshed by RTM version VS 2017

commit 24dcf7c
Author: Andre Esteve <andreesteve@gmail.com>
Date:   Thu Mar 2 20:09:27 2017 +0000

    Apply workaround for netstandard 1.6 tooling

    Issue: dotnet/roslyn#12918

commit a7e4677
Author: Steve Ickman <stevenic@microsoft.com>
Date:   Tue Feb 28 19:21:39 2017 -0800

    Adding snippets needing for new docs.

commit a170fa4
Author: Andre Esteve <andreesteve@gmail.com>
Date:   Fri Feb 24 22:20:46 2017 +0000

    Revert EOL changes

commit 1003f26
Author: Steve Ickman <stevenic@microsoft.com>
Date:   Thu Feb 23 18:26:33 2017 -0800

    Updated package.json version

commit 091e0f4
Author: Carlos Castro <ccastro@microsoft.com>
Date:   Tue Feb 21 11:30:16 2017 -0800

    Prompts methods verification for session parameter

commit df9e9a7
Author: Carlos Castro <ccastro@microsoft.com>
Date:   Tue Feb 21 11:25:29 2017 -0800

    Prompts.text outputs a meaningful error message when session is not provided

commit f67dea2
Author: Yegor Denisov <yegor.denisov@gmail.com>
Date:   Thu Feb 23 11:47:44 2017 -0800

    Add missing IdentityModel packages to samples

commit 6676183
Author: iedeny <iedeny@microsoft.com>
Date:   Wed Feb 22 19:40:06 2017 -0800

    Downgrade AutoRest back to 0.16.0

commit 3d1745b
Author: iedeny <iedeny@microsoft.com>
Date:   Wed Feb 22 19:23:45 2017 -0800

    Add AspNetCore.Mvc to original solution

commit 40f8b74
Author: Andre Esteve <andreesteve@gmail.com>
Date:   Thu Feb 23 04:00:50 2017 +0000

    Add package for Builder.Framework and Connector.AspNetCore.Mvc

commit e0710fe
Author: Andre Esteve <andreesteve@gmail.com>
Date:   Thu Feb 23 03:06:22 2017 +0000

    Update autorest version in generateClient.cmd

commit 038d647
Author: Andre Esteve <andreesteve@gmail.com>
Date:   Thu Feb 23 00:58:53 2017 +0000

    Add check for service provider registered on autofac composition
     - Add missing packages to samples
     - Fix authentication on AspNetCore project when secret is not provided

commit 72497b1
Author: iedeny <iedeny@microsoft.com>
Date:   Wed Feb 22 19:10:09 2017 -0800

    Add new AspNetCore.Mvc projects

commit 2421b93
Author: iedeny <iedeny@microsoft.com>
Date:   Wed Feb 22 12:33:45 2017 -0800

    Rename Connector.Abstractions folder back to Connector.Shared
     - Remove ApplicationInsights package from AspNetCore.Pizza sample
     - Consolidate packages to latest
     - Fix folder name in packaging script for Shared project
     - Fix remaining unit test failures
     - Consolidate assembly version

commit 30183de
Author: Andre Esteve <andreesteve@gmail.com>
Date:   Wed Feb 22 02:25:39 2017 +0000

    Update nuget package creation

commit 1890960
Author: Andre Esteve <andreesteve@gmail.com>
Date:   Wed Feb 22 00:30:29 2017 +0000

    Update System.Net.Http to 4.3.1

    This is required to address issue https://github.com/dotnet/corefx/issues/11100

commit f2bc432
Author: Andre Esteve <andreesteve@gmail.com>
Date:   Thu Feb 16 23:43:11 2017 +0000

    Enable ASP.NET CORE usage with BotBuilder

     - Fix simple sandwich bot and add TODO comment
     - Improve Service resolution for multi-platform support
     - Remove remaining #IF NET45 compiler conditionals
     - Remove #IF NET45 conditionals merge from upstream

commit aa72e0f
Author: Andre Esteve <andreesteve@gmail.com>
Date:   Thu Feb 16 17:34:01 2017 +0000

    Add IBotConfiguration to abstract ConfigurationManager out of portable code

commit 64f3edc
Author: iedeny <iedeny@microsoft.com>
Date:   Wed Feb 15 15:54:34 2017 -0800

    Update System.Net.Http to 4.3.1

commit 2636a24
Author: iedeny <iedeny@microsoft.com>
Date:   Wed Feb 15 12:39:58 2017 -0800

    Remove xproj
    Add VS2017 solution to support netcore projects

commit 71f1189
Author: iedeny <iedeny@microsoft.com>
Date:   Wed Feb 15 11:37:04 2017 -0800

    Autofac now references common connector library

commit 094213e
Author: Yegor Denisov <yegor.denisov@gmail.com>
Date:   Mon Feb 13 03:13:00 2017 -0800

    Add AspNet Core pizza bot sample

commit c6b4f69
Author: Yegor Denisov <yegor.denisov@gmail.com>
Date:   Sat Feb 11 05:39:11 2017 -0800

    Convert AspNetCore Connector into portable library

     - Convert aspnet core connector to netstandard 1.4
     - Fix System.Net.Http binding

commit 0d590d4
Author: Yegor Denisov <yegor.denisov@gmail.com>
Date:   Sat Feb 11 04:44:41 2017 -0800

    Consolidate all nuget packages.
    Update all packages except Moq, Autofac and Castle.Core

commit d220e63
Author: Yegor Denisov <yegor.denisov@gmail.com>
Date:   Sat Feb 11 02:29:40 2017 -0800

    Convert shared Connector code into a separate library

commit ce39e2a
Author: Steve Ickman <stevenic@microsoft.com>
Date:   Thu Feb 23 15:08:25 2017 -0800

    Removed node-uuid.
    We're not using it and it's deprecated.

commit 4bccc42
Author: Steve Ickman <stevenic@microsoft.com>
Date:   Wed Feb 22 17:43:00 2017 -0800

    Moved locale files to output

commit ad2c98b
Author: Steve Ickman <stevenic@microsoft.com>
Date:   Tue Feb 21 14:14:10 2017 -0800

    RegExpRecognizer fails on Node-RED
    - Added duck typing based check to constructor as instanceof doesn't work on Node-RED

commit f26b12f
Author: Steve Ickman <stevenic@microsoft.com>
Date:   Tue Feb 21 10:57:02 2017 -0800

    Session.validateDialogStack() always succeeded.

commit c7e981a
Merge: 99bd9ce a8cbef0
Author: Steven Ickman <stevenic@microsoft.com>
Date:   Wed Feb 22 17:40:38 2017 -0800

    Merge pull request #2026 from saveriopalmieri/master

    New locale (PT - Portuguese) for NodeJs BotBuilder

commit 99bd9ce
Author: Andrea-Orimoto <andreo@microsoft.com>
Date:   Tue Feb 21 14:52:32 2017 -0800

    Update ISSUE_TEMPLATE

commit ea0ed7d
Author: Andrea-Orimoto <andreo@microsoft.com>
Date:   Tue Feb 21 14:47:14 2017 -0800

    Create ISSUE_TEMPLATE

commit 16dd579
Author: Steve Ickman <stevenic@microsoft.com>
Date:   Thu Feb 16 16:40:16 2017 -0800

    Updated build process
    - Build now builds directly to live.
    - botbuilder.d.ts & locale files are only in lib.

commit 15a6ded
Author: Steve Ickman <stevenic@microsoft.com>
Date:   Thu Feb 16 16:39:13 2017 -0800

    Added support for intent forwarding.

commit b47dab3
Merge: 8542c89 6f3a08c
Author: Chris McConnell <chrimc@microsoft.com>
Date:   Fri Feb 17 11:44:45 2017 -0800

    Merge pull request #2212 from ArtisanDuCode/master

    Fixed Caps non Non

commit 8542c89
Author: Shahin Shayandeh <shahins@microsoft.com>
Date:   Thu Feb 16 16:41:35 2017 -0800

    Update assembly versions to 3.5.3

commit 497252e
Merge: c769a9f 9ae4978
Author: Shahin Shayandeh <shahins@microsoft.com>
Date:   Thu Feb 16 16:31:16 2017 -0800

    Merge branch 'develop'

commit 6f3a08c
Author: Un artisan du Code <lartisanducode@gmail.com>
Date:   Wed Feb 8 19:49:29 2017 +0100

    Fixed Caps non Non

commit c769a9f
Author: Shahin Shayandeh <shahins@microsoft.com>
Date:   Tue Feb 7 12:53:39 2017 -0800

    Update bot.builder assembly version to 3.5.2

commit 8cd6598
Author: Shahin Shayandeh <shahins@microsoft.com>
Date:   Tue Feb 7 13:00:30 2017 -0800

    Update persian resource file with the resource file generated by multilingual app tool

commit 387e7e5
Author: Behnam Emamian <emamian@persianprocess.com>
Date:   Wed Feb 8 07:55:56 2017 +1100

    Fixing persian resources. (#2020)

    * Fixing persian resources.

    * Fixing persian resources

commit a8cbef0
Author: Saverio Palmieri <Saverio Palmieri>
Date:   Thu Jan 12 20:26:29 2017 -0200

    Small typos.

commit 56e6aab
Author: Saverio Palmieri <Saverio Palmieri>
Date:   Thu Jan 12 19:58:47 2017 -0200

    Added locale files for PT (Portuguese) language
@nwhitmont nwhitmont added this to Merged (Accepted) in Pull Requests - .NET SDK May 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@msft-shahins msft-shahins

Labels
None yet
Projects
No open projects
Pull Requests - .NET SDK
Merged (Accepted)
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Behnam-Emamian @azurecla @msft-shahins @willportnoy